From: Alexandre Oliva <oliva@dcc.unicamp.br>
Date: Mon, 8 Mar 1999 20:55:57 +0000 (+0000)
Subject: * ltmain.in (hardcode_libdir_separator, compile_rpath,
X-Git-Tag: release-1-2f~69
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8edf7d315b3c6ada1cfe913663fbfc9540c228f6;p=thirdparty%2Flibtool.git

* ltmain.in (hardcode_libdir_separator, compile_rpath,
finalize_rpath): only substitute hardcode_libdir_flag_spec if
hardcode_libdirs is non-empty
---

diff --git a/ChangeLog b/ChangeLog
index 1c72f8736..4a9834862 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 1999-03-08  Alexandre Oliva  <oliva@dcc.unicamp.br>
 
+	* ltmain.in (hardcode_libdir_separator, compile_rpath,
+	finalize_rpath): only substitute hardcode_libdir_flag_spec if
+	hardcode_libdirs is non-empty
+
 	* libtool.m4 (AC_LIBTOOL_DLOPEN): do not depend on the existence
 	of dlfcn.h nor on the definition of RTLD_LAZY
 
diff --git a/ltmain.in b/ltmain.in
index 4c9231d47..d7a340ec7 100644
--- a/ltmain.in
+++ b/ltmain.in
@@ -2212,7 +2212,8 @@ EOF
 	fi
       done
       # Substitute the hardcoded libdirs into the rpath.
-      if test -n "$hardcode_libdir_separator"; then
+      if test -n "$hardcode_libdir_separator" &&
+	 test -n "$hardcode_libdirs"; then
 	libdir="$hardcode_libdirs"
 	eval rpath=\" $hardcode_libdir_flag_spec\"
       fi
@@ -2254,7 +2255,8 @@ EOF
 	fi
       done
       # Substitute the hardcoded libdirs into the rpath.
-      if test -n "$hardcode_libdir_separator"; then
+      if test -n "$hardcode_libdir_separator" &&
+	 test -n "$hardcode_libdirs"; then
 	libdir="$hardcode_libdirs"
 	eval rpath=\" $hardcode_libdir_flag_spec\"
       fi