Mercurial > hg > octave-lyh
changeset 6710:95ecf87531ca
[project @ 2007-06-13 06:57:27 by jwe]
author | jwe |
---|---|
date | Wed, 13 Jun 2007 06:57:27 +0000 |
parents | dda2239726cb |
children | 08dd19ee4af1 |
files | ChangeLog Makeconf.in mkoctfile.in |
diffstat | 3 files changed, 14 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2007-06-13 Michael Goffioul <michael.goffioul@swing.be> + + * Makeconf.in (do-subst-config-vals): Also substitute ${libdir} as + OCTAVE_CONF_LIBDIR. + * mkoctfile.in: Set DEFAULT_LIBDIR and substitute OCTAVE_HOME. + Define LIBDIR. Use LIBDIR to set DEFAULT_LFLAGS. + 2007-06-12 Benjamin Lindner <lindnerben@gmx.net> * configure.in: For mingw, add -lws2_32 -lkernel32 to LIBS and set
--- a/Makeconf.in +++ b/Makeconf.in @@ -489,6 +489,7 @@ -e "s|%OCTAVE_CONF_LEXLIB%|\"${LEXLIB}\"|" \ -e "s|%OCTAVE_CONF_LFLAGS%|\"${LFLAGS}\"|" \ -e "s|%OCTAVE_CONF_LIBCRUFT%|\"${LIBCRUFT}\"|" \ + -e "s|%OCTAVE_CONF_LIBDIR%|\"${libdir}\"|" \ -e "s|%OCTAVE_CONF_LIBDLFCN%|\"${LIBDLFCN}\"|" \ -e "s|%OCTAVE_CONF_LIBEXT%|\"${LIBEXT}\"|" \ -e "s|%OCTAVE_CONF_LIBFLAGS%|\"${LIBFLAGS}\"|" \
--- a/mkoctfile.in +++ b/mkoctfile.in @@ -14,18 +14,21 @@ DEFAULT_BINDIR=%OCTAVE_BINDIR% DEFAULT_INCLUDEDIR=%OCTAVE_CONF_INCLUDEDIR% +DEFAULT_LIBDIR=%OCTAVE_CONF_LIBDIR% DEFAULT_OCTINCLUDEDIR=%OCTAVE_CONF_OCTINCLUDEDIR% 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_LIBDIR="`echo $DEFAULT_LIBDIR | $SED "s,^$OCTAVE_PREFIX,$OCTAVE_HOME,"`" DEFAULT_OCTINCLUDEDIR="`echo $DEFAULT_OCTINCLUDEDIR | $SED "s,^$OCTAVE_PREFIX,$OCTAVE_HOME,"`" DEFAULT_OCTLIBDIR="`echo $DEFAULT_OCTLIBDIR | $SED "s,^$OCTAVE_PREFIX,$OCTAVE_HOME,"`" fi : ${BINDIR=$DEFAULT_BINDIR} : ${INCLUDEDIR=$DEFAULT_INCLUDEDIR} +: ${LIBDIR=$DEFAULT_LIBDIR} : ${OCTINCLUDEDIR=$DEFAULT_OCTINCLUDEDIR} : ${OCTLIBDIR=$DEFAULT_OCTLIBDIR} @@ -35,6 +38,9 @@ fi DEFAULT_LFLAGS="-L$OCTLIBDIR" +if [ "$LIBDIR" != /usr/lib ]; then + DEFAULT_LFLAGS="$DEFAULT_LFLAGS -L$LIBDIR" +fi # Default values for these variables are filled in when Octave is # compiled.