diff options
| author | Nathanael Nerode <neroden@gcc.gnu.org> | 2002-10-03 23:08:53 +0400 |
|---|---|---|
| committer | Nathanael Nerode <neroden@gcc.gnu.org> | 2002-10-03 23:08:53 +0400 |
| commit | 8c8150d4c9bbc565a680b8e4a1880a48bf9df11c (patch) | |
| tree | ff9d6a72b7f978f389aa56a758e6beca201d5a3e /configure.in | |
| parent | 3073f3f29d99063621db1a9095053b9eb3275e8b (diff) | |
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.
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/configure.in b/configure.in index bee4c2998..8988bef27 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. |