* 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 1c72f8736c61755e7a4f6af8bd75e43d1bb40d8e..4a9834862bfb77eae09fcc87cdc033221d3815bc 100644 (file)
--- 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 4c9231d47c92db4e2ab7f30e0b8dc5f917f3bda4..d7a340ec7a8938ea2500eec2a515842570c378d7 100644 (file)
--- 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