This is the mail archive of the
binutils@sources.redhat.com
mailing list for the binutils project.
toplevel: more autoconfiness
- From: Nathanael Nerode <neroden at doctormoo dot dyndns dot org>
- To: gcc-patches at gcc dot gnu dot org, gdb-patches at sources dot redhat dot com,binutils at sources dot redhat dot com, dj at redhat dot com
- Date: Thu, 3 Oct 2002 14:56:15 -0400
- Subject: toplevel: more autoconfiness
Similarly to the previous. Tested on i686-pc-linux-gnu by configuring both
with and without --enable-shared; no changes to generated Makefiles in either
case (except one space character).
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.
Index: configure.in
===================================================================
RCS file: /cvs/gcc/gcc/configure.in,v
retrieving revision 1.186
diff -u -r1.186 configure.in
--- configure.in 3 Oct 2002 18:50:19 -0000 1.186
+++ configure.in 3 Oct 2002 18:57:18 -0000
@@ -1321,11 +1321,13 @@
# 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
Index: Makefile.in
===================================================================
RCS file: /cvs/gcc/gcc/Makefile.in,v
retrieving revision 1.124
diff -u -r1.124 Makefile.in
--- Makefile.in 3 Oct 2002 18:50:19 -0000 1.124
+++ Makefile.in 3 Oct 2002 18:57:20 -0000
@@ -201,7 +201,7 @@
# 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.
Index: Makefile.tpl
===================================================================
RCS file: /cvs/gcc/gcc/Makefile.tpl,v
retrieving revision 1.10
diff -u -r1.10 Makefile.tpl
--- Makefile.tpl 3 Oct 2002 18:50:19 -0000 1.10
+++ Makefile.tpl 3 Oct 2002 18:57:22 -0000
@@ -204,7 +204,7 @@
# 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.