diff options
author | H.J. Lu <hjl@gnu.org> | 1999-02-17 00:40:16 +0000 |
---|---|---|
committer | Jeff Law <law@gcc.gnu.org> | 1999-02-16 17:40:16 -0700 |
commit | 8ccdc2287e6a71ec48db700a9e27842a8d7a6a24 (patch) | |
tree | 2729c3e4f88622e7f62d49755ac079b2d1fcada9 | |
parent | 8401285e71a6f652f00f25af207abb02ec1dda4a (diff) | |
download | gcc-8ccdc2287e6a71ec48db700a9e27842a8d7a6a24.zip gcc-8ccdc2287e6a71ec48db700a9e27842a8d7a6a24.tar.gz gcc-8ccdc2287e6a71ec48db700a9e27842a8d7a6a24.tar.bz2 |
Makefile.in (REALLY_SET_LIB_PATH): Append $$$(RPATH_ENVVAR) only if it is not empty.
�
* Makefile.in (REALLY_SET_LIB_PATH): Append $$$(RPATH_ENVVAR)
only if it is not empty.
From-SVN: r25258
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | Makefile.in | 6 |
2 files changed, 10 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Wed Feb 17 01:38:59 1999 H.J. Lu (hjl@gnu.org) + + * Makefile.in (REALLY_SET_LIB_PATH): Append $$$(RPATH_ENVVAR) + only if it is not empty. + Sun Feb 7 18:01:54 1999 Mumit Khan <khan@xraylith.wisc.edu> * configure.in (*-*-cygwin32*): Use config/mh-cygwin instead of diff --git a/Makefile.in b/Makefile.in index f619e87..79527fb 100644 --- a/Makefile.in +++ b/Makefile.in @@ -187,7 +187,11 @@ RPATH_ENVVAR = LD_LIBRARY_PATH # configure.in sets SET_LIB_PATH to this if --enable-shared was used. REALLY_SET_LIB_PATH = \ - $(RPATH_ENVVAR)=$$r/bfd:$$r/opcodes:$$$(RPATH_ENVVAR); \ + if [ x"$$$(RPATH_ENVVAR)" != x ]; then \ + $(RPATH_ENVVAR)=$$r/bfd:$$r/opcodes:$$$(RPATH_ENVVAR); \ + else \ + $(RPATH_ENVVAR)=$$r/bfd:$$r/opcodes; \ + fi; \ export $(RPATH_ENVVAR); ALL = all.normal |