aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--Makefile.in4
-rw-r--r--Makefile.tpl4
-rw-r--r--configure.in29
4 files changed, 28 insertions, 17 deletions
diff --git a/ChangeLog b/ChangeLog
index 0228060..f01dee3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2002-10-03 Nathanael Nerode <neroden@gcc.gnu.org>
+
+ * Makefile.tpl: Make SET_LIB_PATH substitution more autoconfy.
+ * Makefile.tpl: Make RPATH_ENVVAR substitution more autoconfy.
+ * configure.in: Make SET_LIB_PATH substitution more autoconfy.
+ * configure.in: Make RPATH_ENVVAR substitution more autoconfy.
+ * Makefile.in: Regenerate.
+
2002-10-02 Nathanael Nerode <neroden@gcc.gnu.org>
* Makefile.tpl: Eliminate reference to all-gui, all-libproc.
diff --git a/Makefile.in b/Makefile.in
index c78623f..ce4bffa 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -201,11 +201,11 @@ 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.
-RPATH_ENVVAR = LD_LIBRARY_PATH
+RPATH_ENVVAR = @RPATH_ENVVAR@
# This is the list of directories that may be needed in RPATH_ENVVAR
# so that programs built for the host machine work.
diff --git a/Makefile.tpl b/Makefile.tpl
index 01532e6..5ef7d55 100644
--- a/Makefile.tpl
+++ b/Makefile.tpl
@@ -204,11 +204,11 @@ 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.
-RPATH_ENVVAR = LD_LIBRARY_PATH
+RPATH_ENVVAR = @RPATH_ENVVAR@
# This is the list of directories that may be needed in RPATH_ENVVAR
# so that programs built for the host machine work.
diff --git a/configure.in b/configure.in
index bee4c29..8988bef 100644
--- a/configure.in
+++ b/configure.in
@@ -1321,20 +1321,23 @@ 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
-
- case "${host}" in
- *-*-hpux*)
- sed -e 's/^RPATH_ENVVAR[ ]*=.*$/RPATH_ENVVAR = SHLIB_PATH/' \
- Makefile > Makefile.tem
- rm -f Makefile
- mv -f Makefile.tem Makefile
- ;;
- esac
+ 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
+ *-*-hpux*) RPATH_ENVVAR=SHLIB_PATH ;;
+ *) RPATH_ENVVAR=LD_LIBRARY_PATH ;;
+esac
+sed -e "s/@RPATH_ENVVAR@/${RPATH_ENVVAR}/" Makefile > Makefile.tem
+rm -f Makefile
+mv -f Makefile.tem Makefile
+
# Base args. Strip norecursion, cache-file, srcdir, host, build, target.
# These are the ones we might not want to pass down to subconfigures.