From a762a716be4e74488e4b152f1f8af9ed5246d71c Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Thu, 19 Feb 2015 16:38:30 +0100
Subject: [PATCH] xbps-src: do not append to make_install_args, to make
 overrides possible.

Thanks @chneukirchen
---
 common/build_style/cmake.sh         | 4 +---
 common/build_style/configure.sh     | 4 +---
 common/build_style/gnu-configure.sh | 4 +---
 common/build_style/gnu-makefile.sh  | 4 +---
 common/build_style/perl-module.sh   | 4 +---
 common/build_style/python-module.sh | 5 ++---
 common/build_style/waf.sh           | 4 +---
 common/build_style/waf3.sh          | 4 +---
 8 files changed, 9 insertions(+), 24 deletions(-)

diff --git a/common/build_style/cmake.sh b/common/build_style/cmake.sh
index 18f9657c4f..c92812aa17 100644
--- a/common/build_style/cmake.sh
+++ b/common/build_style/cmake.sh
@@ -46,8 +46,6 @@ do_install() {
 	: ${make_cmd:=make}
 	: ${make_install_target:=install}
 
-	make_install_args+=" DESTDIR=${DESTDIR}"
-
 	cd build
-	${make_cmd} ${make_install_args} ${make_install_target}
+	${make_cmd} DESTDIR=${DESTDIR} ${make_install_args} ${make_install_target}
 }
diff --git a/common/build_style/configure.sh b/common/build_style/configure.sh
index b310a88a3d..f399e2d512 100644
--- a/common/build_style/configure.sh
+++ b/common/build_style/configure.sh
@@ -18,7 +18,5 @@ do_install() {
 	: ${make_cmd:=make}
 	: ${make_install_target:=install}
 
-	make_install_args+=" DESTDIR=${DESTDIR}"
-
-	${make_cmd} ${make_install_args} ${make_install_target}
+	${make_cmd} DESTDIR=${DESTDIR} ${make_install_args} ${make_install_target}
 }
diff --git a/common/build_style/gnu-configure.sh b/common/build_style/gnu-configure.sh
index 8177b844e6..e0de801715 100644
--- a/common/build_style/gnu-configure.sh
+++ b/common/build_style/gnu-configure.sh
@@ -17,7 +17,5 @@ do_install() {
 	: ${make_cmd:=make}
 	: ${make_install_target:=install}
 
-	make_install_args+=" DESTDIR=${DESTDIR}"
-
-	${make_cmd} ${make_install_args} ${make_install_target}
+	${make_cmd} DESTDIR=${DESTDIR} ${make_install_args} ${make_install_target}
 }
diff --git a/common/build_style/gnu-makefile.sh b/common/build_style/gnu-makefile.sh
index f0a889f7fe..f7d75b9056 100644
--- a/common/build_style/gnu-makefile.sh
+++ b/common/build_style/gnu-makefile.sh
@@ -14,7 +14,5 @@ do_install() {
 	: ${make_cmd:=make}
 	: ${make_install_target:=install}
 
-	make_install_args+=" STRIP=: PREFIX=/usr DESTDIR=${DESTDIR}"
-
-	${make_cmd} ${make_install_args} ${make_install_target}
+	${make_cmd} STRIP=true PREFIX=/usr DESTDIR=${DESTDIR} ${make_install_args} ${make_install_target}
 }
diff --git a/common/build_style/perl-module.sh b/common/build_style/perl-module.sh
index 37c5c3a71b..84775835ed 100644
--- a/common/build_style/perl-module.sh
+++ b/common/build_style/perl-module.sh
@@ -58,7 +58,5 @@ do_install() {
 	: ${make_cmd:=make}
 	: ${make_install_target:=install}
 
-	make_install_args+=" DESTDIR=${DESTDIR}"
-
-	${make_cmd} ${make_install_args} ${make_install_target}
+	${make_cmd} DESTDIR=${DESTDIR} ${make_install_args} ${make_install_target}
 }
diff --git a/common/build_style/python-module.sh b/common/build_style/python-module.sh
index 624ae5223b..e1fb5485fa 100644
--- a/common/build_style/python-module.sh
+++ b/common/build_style/python-module.sh
@@ -30,8 +30,6 @@ do_install() {
 	: ${python_versions:=2.7}
 	local pyver= pysufx=
 
-	make_install_args+=" --prefix=/usr --root=$DESTDIR"
-
 	for pyver in $python_versions; do
 		if [ -n "$CROSS_BUILD" ]; then
 			PYPREFIX="$XBPS_CROSS_BASE"
@@ -47,7 +45,8 @@ do_install() {
 				LDFLAGS="$LDFLAGS" python${pyver} setup.py \
 					build --build-base=build-${pyver} install ${make_install_args}
 		else
-			python${pyver} setup.py build --build-base=build-${pyver} install ${make_install_args}
+			python${pyver} setup.py build --build-base=build-${pyver} \
+				install --prefix=/usr --root=$DESTDIR ${make_install_args}
 		fi
 	done
 }
diff --git a/common/build_style/waf.sh b/common/build_style/waf.sh
index 5b241c2950..6b30d5b344 100644
--- a/common/build_style/waf.sh
+++ b/common/build_style/waf.sh
@@ -10,7 +10,5 @@ do_build() {
 }
 
 do_install() {
-	make_install_args+=" --destdir=${DESTDIR}"
-
-	python waf install ${make_install_args}
+	python waf install --destdir=${DESTDIR} ${make_install_args}
 }
diff --git a/common/build_style/waf3.sh b/common/build_style/waf3.sh
index bfa11c3614..8701189bf2 100644
--- a/common/build_style/waf3.sh
+++ b/common/build_style/waf3.sh
@@ -10,7 +10,5 @@ do_build() {
 }
 
 do_install() {
-	make_install_args+=" --destdir=$DESTDIR"
-
-	PYTHON=python3 python3 waf install ${make_install_args}
+	PYTHON=python3 python3 waf install --destdir=${DESTDIR} ${make_install_args}
 }