From 8ccdc2287e6a71ec48db700a9e27842a8d7a6a24 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Wed, 17 Feb 1999 00:40:16 +0000 Subject: [PATCH] Makefile.in (REALLY_SET_LIB_PATH): Append $$$(RPATH_ENVVAR) only if it is not empty. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit � * Makefile.in (REALLY_SET_LIB_PATH): Append $$$(RPATH_ENVVAR) only if it is not empty. From-SVN: r25258 --- ChangeLog | 5 +++++ Makefile.in | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 48172084293..8b43cc4ce45 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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 * configure.in (*-*-cygwin32*): Use config/mh-cygwin instead of diff --git a/Makefile.in b/Makefile.in index f619e87abc6..79527fbdd64 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