diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rw-r--r-- | Makefile.tpl | 2 | ||||
| -rw-r--r-- | configure.in | 10 |
4 files changed, 12 insertions, 6 deletions
@@ -1,5 +1,9 @@ 2002-10-03 Nathanael Nerode <neroden@gcc.gnu.org> + * Makefile.tpl: Make SET_LIB_PATH substitution more autoconfy. + * configure.in: Make SET_LIB_PATH substitution more autoconfy. + * Makefile.in: Regenerate. + * Makefile.tpl: Make RPATH_ENVVAR substitution more autoconfy. * configure.in: Make RPATH_ENVVAR substitution more autoconfy. * Makefile.in: Regenerate. diff --git a/Makefile.in b/Makefile.in index 6d5acc6..ce4bffa 100644 --- a/Makefile.in +++ b/Makefile.in @@ -201,7 +201,7 @@ BUILD_CONFIGARGS = @build_configargs@ # This is set by configure to REALLY_SET_LIB_PATH if --enable-shared # was used. -SET_LIB_PATH = +SET_LIB_PATH = @SET_LIB_PATH@ # This is the name of the environment variable used for the path to # the libraries. This may be changed by configure.in. diff --git a/Makefile.tpl b/Makefile.tpl index 2c72994..5ef7d55 100644 --- a/Makefile.tpl +++ b/Makefile.tpl @@ -204,7 +204,7 @@ BUILD_CONFIGARGS = @build_configargs@ # This is set by configure to REALLY_SET_LIB_PATH if --enable-shared # was used. -SET_LIB_PATH = +SET_LIB_PATH = @SET_LIB_PATH@ # This is the name of the environment variable used for the path to # the libraries. This may be changed by configure.in. diff --git a/configure.in b/configure.in index 98f56c3..8988bef 100644 --- a/configure.in +++ b/configure.in @@ -1321,11 +1321,13 @@ esac # If --enable-shared was set, we must set LD_LIBRARY_PATH so that the # binutils tools will find libbfd.so. if test "${shared}" = "yes" ; then - sed -e 's/^SET_LIB_PATH[ ]*=.*$/SET_LIB_PATH = $(REALLY_SET_LIB_PATH)/' \ - Makefile > Makefile.tem - rm -f Makefile - mv -f Makefile.tem Makefile + SET_LIB_PATH="\$(REALLY_SET_LIB_PATH)" +else + SET_LIB_PATH= fi +sed -e "s/@SET_LIB_PATH@/${SET_LIB_PATH}/" Makefile > Makefile.tem +rm -f Makefile +mv -f Makefile.tem Makefile case "${host}" in |