[debhelper-devel] [debhelper] 01/01: cmake.pm: Set SYSCONFDIF and LOCALESTATEDIR

Niels Thykier nthykier at moszumanska.debian.org
Thu Aug 13 13:12:03 UTC 2015


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

nthykier pushed a commit to branch master
in repository debhelper.

commit 5b0c5a648db0e1729714db18eb8128569758df6f
Author: Niels Thykier <niels at thykier.net>
Date:   Thu Aug 13 15:11:58 2015 +0200

    cmake.pm: Set SYSCONFDIF and LOCALESTATEDIR
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 Debian/Debhelper/Buildsystem/cmake.pm | 14 +++++++++-----
 debian/changelog                      |  5 +++++
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/Debian/Debhelper/Buildsystem/cmake.pm b/Debian/Debhelper/Buildsystem/cmake.pm
index f778c6d..6bd591b 100644
--- a/Debian/Debhelper/Buildsystem/cmake.pm
+++ b/Debian/Debhelper/Buildsystem/cmake.pm
@@ -11,6 +11,14 @@ use warnings;
 use Debian::Debhelper::Dh_Lib qw(compat dpkg_architecture_value error is_cross_compiling);
 use parent qw(Debian::Debhelper::Buildsystem::makefile);
 
+my @STANDARD_CMAKE_FLAGS = qw(
+  -DCMAKE_INSTALL_PREFIX=/usr
+  -DCMAKE_VERBOSE_MAKEFILE=ON
+  -DCMAKE_BUILD_TYPE=None
+  -DCMAKE_INSTALL_SYSCONFDIR=/etc
+  -DCMAKE_INSTALL_LOCALSTATEDIR=/var
+);
+
 my %DEB_HOST2CMAKE_SYSTEM = (
 	'linux'    => 'Linux',
 	'kfreebsd' => 'FreeBSD',
@@ -45,12 +53,8 @@ sub new {
 
 sub configure {
 	my $this=shift;
-	my @flags;
-
 	# Standard set of cmake flags
-	push @flags, "-DCMAKE_INSTALL_PREFIX=/usr";
-	push @flags, "-DCMAKE_VERBOSE_MAKEFILE=ON";
-	push @flags, "-DCMAKE_BUILD_TYPE=None";
+	my @flags = @STANDARD_CMAKE_FLAGS;
 
 	if (is_cross_compiling()) {
 		my $deb_host = dpkg_architecture_value("DEB_HOST_ARCH_OS");
diff --git a/debian/changelog b/debian/changelog
index cdfa82b..3ec9c24 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,11 @@ debhelper (9.20150811+unreleased) UNRELEASED; urgency=medium
   * cmake.pm: Add better cross-compile support for cmake.
     Heavily based on a patch from Helmut Grohne.
     (Closes: #794396)
+  * cmake.pm: Pass -DCMAKE_INSTALL_SYSCONFDIR=/etc and
+    -DCMAKE_INSTALL_LOCALSTATEDIR=/var to cmake.  Thanks to
+    Felix Geyer, Lisandro Damián Nicanor Pérez Meyer and
+    Michael Terry for the assistance plus suggestions.
+    (Closes: #719148)
 
  -- Niels Thykier <niels at thykier.net>  Wed, 12 Aug 2015 10:46:59 +0200
 

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




More information about the debhelper-devel mailing list