Mercurial > forge

changeset 3978:93a6b5e2d003 octave-forge

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Further changes because of the change from f2c to fort77.
author treichl
date Mon, 29 Oct 2007 18:30:00 +0000
parents ac2f9a24c888
children 55f631e5d330
files admin/MacOSX/createapp/octave.in
diffstat 1 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/admin/MacOSX/createapp/octave.in	Sun Oct 28 21:43:01 2007 +0000
+++ b/admin/MacOSX/createapp/octave.in	Mon Oct 29 18:30:00 2007 +0000
@@ -52,9 +52,11 @@
 # CFLAGS="-I${ROOT}/include -I${ROOT}/include/octave-%VERSION%"
 
 # Setting up other variables that are needed to run the Octave program
-# or mkoctfile.
+# or mkoctfile and to install packages.
 DL_LDFLAGS="-bundle -bundle_loader ${ROOT}/bin/octave-%VERSION%"
 SED="/usr/bin/sed"
+CC=`mkoctfile -p CC`
+CXX=`mkoctfile -p CXX`
 
 # Export the variables that have been defined before so that the
 # Octave program gets knowledge about them.
@@ -66,7 +68,7 @@
 # Invoke Octave, preserving spaces in all the input arguments.
 OCTAVE_HOME="${OCTAVE_HOME}" PATH="${PATH}" \
   DYLD_LIBRARY_PATH="${DYLD_LIBRARY_PATH}" \
-  CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" \
+  CC=${CC} CXX=${CXX} CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" \
   CXXFLAGS="${CXXFLAGS}" FFLAGS="${FFLAGS}" LDFLAGS="${LDFLAGS}" \
   DL_LDFLAGS="${DL_LDFLAGS}" SED="$SED" \
 "${ROOT}/bin/octave-%VERSION%" "$@"