cmake: Avoid forcing rpath off as this can break some test suites. It gets stripped...

diff --git a/Debian/Debhelper/Buildsystem/cmake.pm b/Debian/Debhelper/Buildsystem/cmake.pm
index 2c52e494bf1611a829c60648d7785c6de58d7a2d..21a077ec284eb43e9c0364d8f86f88b53a7b5f1b 100644 (file)
--- a/Debian/Debhelper/Buildsystem/cmake.pm
+++ b/Debian/Debhelper/Buildsystem/cmake.pm
@@ -34,7 +34,6 @@ sub configure {
 
        # Standard set of cmake flags
        push @flags, "-DCMAKE_INSTALL_PREFIX=/usr";
-       push @flags, "-DCMAKE_SKIP_RPATH=ON";
        push @flags, "-DCMAKE_VERBOSE_MAKEFILE=ON";
 
        $this->mkdir_builddir();

diff --git a/debian/changelog b/debian/changelog
index be712d288715101c5b5a6a45414e184cf8c87e67..7de67349f51bfb7859f15b097a66e38d060bf448 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+debhelper (7.3.9) UNRELEASED; urgency=low
+
+  * cmake: Avoid forcing rpath off as this can break some test suites.
+    It gets stripped by cmake at install time. Closes: #538977
+
+ -- Joey Hess <joeyh@debian.org>  Sat, 01 Aug 2009 15:49:54 -0400
+
 debhelper (7.3.8) unstable; urgency=low
 
   * Fix t/override_target to use ./run. Closes: #538315