Mercurial > hg > octave-nkf
changeset 6682:1e440ccda1ca
[project @ 2007-06-01 19:34:56 by jwe]
| author | jwe |
|---|---|
| date | Fri, 01 Jun 2007 19:34:56 +0000 |
| parents | 0458599c50d7 |
| children | a2f697dca2a4 |
| files | ChangeLog Makeconf.in configure.in mkoctfile.in |
| diffstat | 4 files changed, 21 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2007-06-01 John W. Eaton <jwe@octave.org> + + * configure.in (*-*-darwin*): Fix quoting and construction of + MKOCTFILE_DL_LDFLAGS. + * mkoctfile.in (DEFAULT_BINDIR, EXEEXT): New substitutions. + * Makeconf.in (MKOCTFILE_DL_LDFLAGS): Delete. + (do-subst-config-vals): Do configure substitution of + MKOCTFILE_DL_LDFLAGS directly here instead of using intermediate + variable. Quote this sed substitution with ' instead of ". + 2007-05-29 Steven Mestdagh <steven.mestdagh@esat.kuleuven.be> * configure.in: Delete spurious "break" in fftw3 check.
--- a/Makeconf.in +++ b/Makeconf.in @@ -351,8 +351,6 @@ # LD_LIBRARY_PATH, DYLD_LIBRARY_PATH, PATH, ... library_path_var = @library_path_var@ -MKOCTFILE_DL_LDFLAGS = @MKOCTFILE_DL_LDFLAGS@ - NO_OCT_FILE_STRIP = @NO_OCT_FILE_STRIP@ # The following pattern rules and the substitution functions require @@ -500,7 +498,7 @@ -e "s|%OCTAVE_CONF_LIBREADLINE%|\"${LIBREADLINE}\"|" \ -e "s|%OCTAVE_CONF_LIBS%|\"${LIBS}\"|" \ -e "s|%OCTAVE_CONF_LN_S%|\"${LN_S}\"|" \ - -e "s|%OCTAVE_CONF_MKOCTFILE_DL_LDFLAGS%|\"${MKOCTFILE_DL_LDFLAGS}\"|" \ + -e 's|%OCTAVE_CONF_MKOCTFILE_DL_LDFLAGS%|\"@MKOCTFILE_DL_LDFLAGS@\"|' \ -e "s|%OCTAVE_CONF_OCTINCLUDEDIR%|\"${octincludedir}\"|" \ -e "s|%OCTAVE_CONF_OCTLIBDIR%|\"${octlibdir}\"|" \ -e "s|%OCTAVE_CONF_PREFIX%|\"${prefix}\"|" \
--- a/configure.in +++ b/configure.in @@ -29,7 +29,7 @@ EXTERN_CXXFLAGS="$CXXFLAGS" AC_INIT -AC_REVISION($Revision: 1.561 $) +AC_REVISION($Revision: 1.562 $) AC_PREREQ(2.57) AC_CONFIG_SRCDIR([src/octave.cc]) AC_CONFIG_HEADER(config.h) @@ -1106,7 +1106,7 @@ ;; *-*-darwin*) DL_LDFLAGS='-bundle -bundle_loader $(TOPDIR)/src/octave $(LDFLAGS)' - MKOCTFILE_DL_LDFLAGS='-bundle -bundle_loader $(bindir)/octave-$(version)$(EXEEXT)' + MKOCTFILE_DL_LDFLAGS='-bundle -bundle_loader $$BINDIR/octave-$$OCTAVE_VERSION$$EXEEXT' SH_LDFLAGS='-dynamiclib -single_module $(LDFLAGS)' CXXPICFLAG= CPICFLAG=
--- a/mkoctfile.in +++ b/mkoctfile.in @@ -12,18 +12,21 @@ OCTAVE_VERSION=%OCTAVE_CONF_VERSION% OCTAVE_PREFIX=%OCTAVE_CONF_PREFIX% +DEFAULT_BINDIR=%OCTAVE_BINDIR% +DEFAULT_INCLUDEDIR=%OCTAVE_CONF_INCLUDEDIR% DEFAULT_OCTINCLUDEDIR=%OCTAVE_CONF_OCTINCLUDEDIR% -DEFAULT_INCLUDEDIR=%OCTAVE_CONF_INCLUDEDIR% DEFAULT_OCTLIBDIR=%OCTAVE_CONF_OCTLIBDIR% if [ -n "$OCTAVE_HOME" ]; then + DEFAULT_BINDIR="`echo $DEFAULT_BINDIR | $SED "s,^$OCTAVE_PREFIX,$OCTAVE_HOME,"`" + DEFAULT_INCLUDEDIR="`echo $DEFAULT_INCLUDEDIR | $SED "s,^$OCTAVE_PREFIX,$OCTAVE_HOME,"`" DEFAULT_OCTINCLUDEDIR="`echo $DEFAULT_OCTINCLUDEDIR | $SED "s,^$OCTAVE_PREFIX,$OCTAVE_HOME,"`" - DEFAULT_INCLUDEDIR="`echo $DEFAULT_INCLUDEDIR | $SED "s,^$OCTAVE_PREFIX,$OCTAVE_HOME,"`" DEFAULT_OCTLIBDIR="`echo $DEFAULT_OCTLIBDIR | $SED "s,^$OCTAVE_PREFIX,$OCTAVE_HOME,"`" fi +: ${BINDIR=$DEFAULT_BINDIR} +: ${INCLUDEDIR=$DEFAULT_INCLUDEDIR} : ${OCTINCLUDEDIR=$DEFAULT_OCTINCLUDEDIR} -: ${INCLUDEDIR=$DEFAULT_INCLUDEDIR} : ${OCTLIBDIR=$DEFAULT_OCTLIBDIR} DEFAULT_INCFLAGS="-I$OCTINCLUDEDIR -I$OCTINCLUDEDIR/octave" @@ -36,6 +39,8 @@ # Default values for these variables are filled in when Octave is # compiled. +: ${EXEEXT=%OCTAVE_CONF_EXEEXT%} + : ${CPPFLAGS=%OCTAVE_CONF_CPPFLAGS%} : ${INCFLAGS=$DEFAULT_INCFLAGS} : ${F2C=%OCTAVE_CONF_F2C%}