aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Makefile.in6
2 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 4817208..8b43cc4 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 <khan@xraylith.wisc.edu>
* configure.in (*-*-cygwin32*): Use config/mh-cygwin instead of
diff --git a/Makefile.in b/Makefile.in
index f619e87..79527fbd 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