From: Jeffrey A Law <law@cygnus.com>
Date: Mon, 22 Feb 1999 22:30:56 +0000 (+0000)
Subject: Makefile.in (REALLY_SET_LIB_PATH): Append $$$(RPATH_ENVVAR) only if it is not empty.
X-Git-Tag: prereleases/egcs-1.1.2-prerelease-2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=76c6669848a69ac4187f8c114fc794805d2d83cc;p=thirdparty%2Fgcc.git

Makefile.in (REALLY_SET_LIB_PATH): Append $$$(RPATH_ENVVAR) only if it is not empty.

        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.

From-SVN: r25383
---

diff --git a/ChangeLog b/ChangeLog
index 0e6fda51a592..6d8920265515 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Feb 22 23:25:59 1999  Jeffrey A Law  (law@cygnus.com)
+
+	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.
+
 Sat Feb 13 12:03:28 1999  Jeffrey A Law  (law@cygnus.com)
 
 	Sat Jan 30 06:09:00 1999  Robert Lipe  (robertlipe@usa.net)
diff --git a/Makefile.in b/Makefile.in
index b1cfd7bd3ac0..cf7090d91eb9 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -173,7 +173,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