Description: Ensure that gfortran is called with the '-fno-automatic' option
Author: Thomas Weber <tweber@debian.org>
Last-Update: 2012-08-05
Bug-Debian: http://bugs.debian.org/664797
Forwarded: http://octave.svn.sourceforge.net/viewvc/octave/trunk/octave-forge/main/odepkg/src/Makefile?r1=10624&r2=10830&pathrev=10830
Applied-Upstream: rev 10830

--- a/src/Makefile
+++ b/src/Makefile
@@ -11,14 +11,12 @@
 # MKMEXFILE = $(MKOCTFILE) --mex
 MKOCTFILE = mkoctfile
 ifeq (gfortran,$(findstring gfortran,$(F77)))
-  MKF77FILE = FFLAGS="-fno-automatic $(FFLAGS)" $(MKOCTFILE)
+  FFLAGS := "-fno-automatic $(FFLAGS)"
 endif
 ifeq (g95,$(findstring g95,$(F77)))
-  MKF77FILE = FFLAGS="-fstatic $(FFLAGS)" $(MKOCTFILE)
-else
-  # eg. the combination f2c with fort77
-  MKF77FILE = FFLAGS="$(FFLAGS)" $(MKOCTFILE)
+  FFLAGS := "-fstatic $(FFLAGS)"
 endif
+MKF77FILE = FFLAGS=$(FFLAGS) $(MKOCTFILE)
 
 LAPACK_LIBS := $(shell mkoctfile -p BLAS_LIBS LAPACK_LIBS)
 FLIBS := $(shell mkoctfile -p FLIBS)
