Fix rpath problem.

diff --git a/configure.ac b/configure.ac
index 325dd0e6b0ec5b98b34fd64676c64d0ca68c8bd8..fb3b28de36aa7f5394465a67283af7bc2a003b20 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -194,10 +194,20 @@ tools/Makefile
 tools/i2enfeature
 tools/mkembedconfig/Makefile
 ])
+
 AC_OUTPUT([
 etc/init.d/icinga2
 ])
 
+# Fix -rpath problem (https://wiki.debian.org/RpathIssue)
+case ${host} in
+  *-linux-gnu)
+    test -f libtool.old || (mv libtool libtool.old && cp libtool.old libtool)
+    sed 's|^sys_lib_dlsearch_path_spec=.*|sys_lib_dlsearch_path_spec="/lib64 /lib /usr/lib64 /usr/lib /usr/local/lib64 /usr/local/lib"|g' libtool >libtool.new
+    mv libtool.new libtool
+  ;;
+esac
+
 if ! test -z "$LTDLDEPS"; then
        ltdl_msg="bundled"
 else

diff --git a/icinga2.spec.in b/icinga2.spec.in
index 79f072edd8cae93a0bd1d659ce342ee14ea54466..a8136292cddbdfe436faf79332cc909a3a156bf5 100644 (file)
--- a/icinga2.spec.in
+++ b/icinga2.spec.in
@@ -71,10 +71,6 @@ IDOUtils schema >= 1.10
        --with-icingacmd-user=$USER \
        --with-icingacmd-group=$USER
 
-# http://fedoraproject.org/wiki/RPath_Packaging_Draft
-sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
-sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
-
 make %{?_smp_mflags}
 
 %install