[Pkg-nagios-changes] [pkg-icinga2] 02/03: Fix build problem with CMake libdir on Hurd and kFreeBSD

[Markus Frosch]

This is an automated email from the git hooks/post-receive script.

lazyfrosch pushed a commit to branch master
in repository pkg-icinga2.

commit dd04e8c74ed736ca15239a56f65246e0a758398f
Author: Markus Frosch <lazyfrosch at debian.org>
Date:   Mon Sep 8 16:29:57 2014 +0200

    Fix build problem with CMake libdir on Hurd and kFreeBSD
    
    Icinga2 used an old CMake script, disabled it to
    use the cmake shipped script.
---
 debian/rules | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/debian/rules b/debian/rules
index 8e37a82..f34da4c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,14 @@
 %:
 	dh $@ --with python2
 
+override_dh_auto_clean:
+	dh_auto_clean
+	test ! -f third-party/cmake/GNUInstallDirs.cmake.disabled || \
+		mv third-party/cmake/GNUInstallDirs.cmake.disabled third-party/cmake/GNUInstallDirs.cmake
+
 override_dh_auto_configure:
+	test -f third-party/cmake/GNUInstallDirs.cmake.disabled || \
+		mv third-party/cmake/GNUInstallDirs.cmake third-party/cmake/GNUInstallDirs.cmake.disabled
 	dh_auto_configure -- \
 		-DCMAKE_INSTALL_LOCALSTATEDIR=/var \
 		-DCMAKE_INSTALL_SYSCONFDIR=/etc \
@@ -36,7 +43,6 @@ override_dh_install:
 		done; \
 	done
 
-
 override_dh_installinit:
 	dh_installinit --name=icinga2
 
@@ -44,4 +50,4 @@ override_dh_installinit:
 override_dh_strip:
 	dh_strip --dbg-package=icinga2-dbg
 
-# vi: noexpandtab :
+# vi: noexpandtab ts=4 sw=4 :

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-nagios/pkg-icinga2.git