[debhelper-devel] [debhelper] 05/12: Fix cmake and qmake prefix settings

[Niels Thykier]

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

nthykier pushed a commit to annotated tag Version_9.20130630co2endless10
in repository debhelper.

commit d7ffa1d55e733c4e6e6b294086398c88a3c0edca
Author: Dan Nicholson <nicholson at endlessm.com>
Date:   Thu Jun 26 12:00:29 2014 -0700

    Fix cmake and qmake prefix settings
    
    Fix prefix to prepend /endless/ to the app id for eos-app profiles.
---
 Debian/Debhelper/Buildsystem/cmake.pm | 2 +-
 Debian/Debhelper/Buildsystem/qmake.pm | 2 +-
 debian/changelog                      | 8 ++++++++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/Debian/Debhelper/Buildsystem/cmake.pm b/Debian/Debhelper/Buildsystem/cmake.pm
index 98e6740..1c44825 100644
--- a/Debian/Debhelper/Buildsystem/cmake.pm
+++ b/Debian/Debhelper/Buildsystem/cmake.pm
@@ -44,7 +44,7 @@ sub configure {
 	if (get_buildprofile("eos-app")) {
 		# Get package app id for prefix
 		my $app_prefix = package_eos_app_id();
-		push @flags, "-DCMAKE_INSTALL_PREFIX=" . $app_prefix;
+		push @flags, "-DCMAKE_INSTALL_PREFIX=/endless/" . $app_prefix;
 	}
 	else {
 		push @flags, "-DCMAKE_INSTALL_PREFIX=/usr";
diff --git a/Debian/Debhelper/Buildsystem/qmake.pm b/Debian/Debhelper/Buildsystem/qmake.pm
index 791f0c6..eeac47d 100644
--- a/Debian/Debhelper/Buildsystem/qmake.pm
+++ b/Debian/Debhelper/Buildsystem/qmake.pm
@@ -69,7 +69,7 @@ sub configure {
 	if (get_buildprofile("eos-app")) {
 		# Build with the app id of the main package by default
 		my $app_prefix=package_eos_app_id();
-		push @flags, "PREFIX=" . $app_prefix;
+		push @flags, "PREFIX=/endless/" . $app_prefix;
 	}
 	else {
 		push @flags, "PREFIX=/usr";
diff --git a/debian/changelog b/debian/changelog
index 3e3c7ae..41f053f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+debhelper (9.20130630co2endless3) eos; urgency=medium
+
+  * Debian/Debhelper/Buildsystem/cmake.pm:
+  * Debian/Debhelper/Buildsystem/qmake.pm:
+    - Fix prefix to prepend /endless/ to the app id for eos-app profiles.
+
+ -- Dan Nicholson <nicholson at endlessm.com>  Thu, 26 Jun 2014 12:00:29 -0700
+
 debhelper (9.20130630co2endless2) eos; urgency=low
 
   * dh_install:

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