Use -rpath on install, so that we know the installation path

diff --git a/scripts/install.mk b/scripts/install.mk
index 900cea459f36afb78c12e0a51930f4934c19c5fe..58a7d3812a54f02b3df31cc3e7e523feeb466395 100644 (file)
--- a/scripts/install.mk
+++ b/scripts/install.mk
@@ -81,7 +81,7 @@ define ADD_INSTALL_RULE.la
     $${${1}_INSTALLDIR}/$(notdir ${1}): $${${1}_BUILD}/$${RELINK}${1}
        @$(ECHO) INSTALL ${1}
        @$${PROGRAM_INSTALL} -d -m 755 $${${1}_INSTALLDIR}
-       @$${PROGRAM_INSTALL} -c -m 755 $${BUILD_DIR}/lib/$${RELINK}${1} $${${1}_INSTALLDIR}/
+       @$${PROGRAM_INSTALL} -c -m 755 $${RELINK_FLAGS_MIN} $${BUILD_DIR}/lib/$${RELINK}${1} $${${1}_INSTALLDIR}/
        @$${${1}_POSTINSTALL}
 
 endef

diff --git a/scripts/libtool.mk b/scripts/libtool.mk
index 533cbbc2fac51f1981369d75ee765a7113a42aae..c1b939256062d2d4de47941983d6eb83b3326c83 100644 (file)
--- a/scripts/libtool.mk
+++ b/scripts/libtool.mk
@@ -146,6 +146,7 @@ ifeq "${bm_shared_libs}" "yes"
     #          with no dependency on the source. 
     RPATH_FLAGS := -rpath $(abspath ${BUILD_DIR})/lib/.libs -rdynamic
     RELINK_FLAGS := -rpath ${libdir} -rdynamic
+    RELINK_FLAGS_MIN := -rpath ${libdir}
     RELINK := relink/
 
     ifneq "${bm_static_libs}" "yes"