Makefile.tpl: Make RPATH_ENVVAR substitution more autoconfy.

2002-10-03  Nathanael Nerode  <neroden@gcc.gnu.org>

	* Makefile.tpl: Make RPATH_ENVVAR substitution more autoconfy.
	* configure.in: Make RPATH_ENVVAR substitution more autoconfy.
	* Makefile.in: Regenerate.

From-SVN: r57782
This commit is contained in:
Nathanael Nerode 2002-10-03 18:50:19 +00:00
parent 3db03e43f9
commit fe3d5b7ff1
4 changed files with 18 additions and 11 deletions

View file

@ -1,3 +1,9 @@
2002-10-03 Nathanael Nerode <neroden@gcc.gnu.org>
* Makefile.tpl: Make RPATH_ENVVAR substitution more autoconfy.
* configure.in: Make RPATH_ENVVAR substitution more autoconfy.
* Makefile.in: Regenerate.
2002-10-02 Janis Johnson <janis187@us.ibm.com>
* MAINTAINERS: Add myself as web pages co-maintainer.

View file

@ -205,7 +205,7 @@ 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.

View file

@ -208,7 +208,7 @@ 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.

View file

@ -1325,17 +1325,18 @@ if test "${shared}" = "yes" ; then
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
fi
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.
baseargs=`echo "${arguments}" | \