Mercurial > forge

changeset 10644:03c6344eb972 octave-forge

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Ensure that the correct FFLAGS value is passed to gfortran.
author thomas-weber
date Sun, 05 Aug 2012 21:22:05 +0000
parents 3966bd53af00
children afe77b16b1a1
files main/odepkg/src/Makefile
diffstat 1 files changed, 3 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/main/odepkg/src/Makefile	Sun Aug 05 15:13:33 2012 +0000
+++ b/main/odepkg/src/Makefile	Sun Aug 05 21:22:05 2012 +0000
@@ -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)