From kde-commits  Sat May 31 21:41:58 2014
From: Michael Pyne <mpyne () kde ! org>
Date: Sat, 31 May 2014 21:41:58 +0000
To: kde-commits
Subject: [kdesrc-build] /: Make make-install-prefix a common option again.
Message-Id: <E1Wqr2M-0004fB-DN () scm ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=140157253104094

Git commit 4a949962c6bf45876769e7a4f1048ebe95d1b756 by Michael Pyne.
Committed on 31/05/2014 at 21:42.
Pushed by mpyne into branch 'master'.

Make make-install-prefix a common option again.

I had made some build-system related options not automatically apply to
modules with customized build systems (e.g. Qt, CMake, "custom"). But
this seems like the kind of option we'd want to have in common, as noted
in a bug report to me by Andre W=C3=B6bbeking, so make make-install-prefix
apply to all build systems by default if it's a global option.

This can, of course, still be overridden for individual modules or
module-sets.

M  +1    -1    doc/index.docbook
M  +1    -1    modules/ksb/BuildSystem.pm

http://commits.kde.org/kdesrc-build/4a949962c6bf45876769e7a4f1048ebe95d1b756

diff --git a/doc/index.docbook b/doc/index.docbook
index d15db62..449ca0d 100644
--- a/doc/index.docbook
+++ b/doc/index.docbook
@@ -2157,7 +2157,7 @@ generated by the script.
 =

 <row id=3D"conf-make-install-prefix">
 <entry>make-install-prefix</entry>
-<entry>Module setting overrides global (build system option)</entry>
+<entry>Module setting overrides global</entry>
 <entry>Set this variable to a space-separated list, which is interpreted a=
s a
 command and its options to precede the <userinput><command>make</command> =
<option>install</option></userinput> command used to install
 modules. This is useful for installing packages with &sudo; for example, b=
ut
diff --git a/modules/ksb/BuildSystem.pm b/modules/ksb/BuildSystem.pm
index 1ec0d4b..b0691fb 100644
--- a/modules/ksb/BuildSystem.pm
+++ b/modules/ksb/BuildSystem.pm
@@ -38,7 +38,7 @@ sub _maskGlobalBuildSystemOptions
     my $ctx =3D $module->buildContext();
     my @buildSystemOptions =3D qw(
         cmake-options configure-flags custom-build-command cxxflags
-        make-install-prefix make-options run-tests use-clean-install
+        make-options run-tests use-clean-install
     );
 =

     for my $opt (@buildSystemOptions) {