[Octave-cvsupdate] SF.net SVN: octave:[10830] trunk/octave-forge/main/odepkg/src/Makefile

[<tho...@us...>]

Revision: 10830
          http://octave.svn.sourceforge.net/octave/?rev=10830&view=rev
Author:   thomas-weber
Date:     2012-08-05 21:22:05 +0000 (Sun, 05 Aug 2012)
Log Message:
-----------
Ensure that the correct FFLAGS value is passed to gfortran.

Modified Paths:
--------------
    trunk/octave-forge/main/odepkg/src/Makefile

Modified: trunk/octave-forge/main/odepkg/src/Makefile
===================================================================
--- trunk/octave-forge/main/odepkg/src/Makefile	2012-08-05 15:13:33 UTC (rev 10829)
+++ trunk/octave-forge/main/odepkg/src/Makefile	2012-08-05 21:22:05 UTC (rev 10830)
@@ -13,14 +13,12 @@
 
 FFLAGS := $(shell $(MKOCTFILE) -p FFLAGS)
 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)
 
 ifndef LAPACK_LIBS
 LAPACK_LIBS := $(shell $(MKOCTFILE) -p BLAS_LIBS) $(shell $(MKOCTFILE) -p LAPACK_LIBS)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.