On Linux, use --enable-new-dtags when specifying -rpath to linker.

This should allow LD_LIBRARY_PATH to work as desired.  Per trouble
report from Andy Colson.

diff --git a/src/makefiles/Makefile.linux b/src/makefiles/Makefile.linux
index d28c7f306d8da0fba1af133be9e13769a9da376a..e266e8fdd5fbbe6f168292e4df1a8d44020c6ace 100644 (file)
--- a/src/makefiles/Makefile.linux
+++ b/src/makefiles/Makefile.linux
@@ -1,6 +1,8 @@
 AROPT = crs
 export_dynamic = -Wl,-E
-rpath = -Wl,-rpath,'$(rpathdir)'
+# Use --enable-new-dtags to generate DT_RUNPATH instead of DT_RPATH.
+# This allows LD_LIBRARY_PATH to still work when needed.
+rpath = -Wl,-rpath,'$(rpathdir)',--enable-new-dtags
 allow_nonpic_in_shlib = yes
 DLSUFFIX = .so