From: Alan T. DeKok <aland@freeradius.org>
Date: Sun, 16 Sep 2012 07:38:55 +0000 (+0200)
Subject: Use -rpath on install, so that we know the installation path
X-Git-Tag: release_3_0_0_beta1~1707
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ee152ae1a6d1f84a6a1de5d8b5f377f70f45a218;p=thirdparty%2Ffreeradius-server.git

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

diff --git a/scripts/install.mk b/scripts/install.mk
index 900cea459f3..58a7d3812a5 100644
--- 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 533cbbc2fac..c1b93925606 100644
--- 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"