PoetryInCode/void-packages
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

xbps-src: do not append to make_install_args, to make overrides possible.

Browse Source 
Thanks @chneukirchen
This commit is contained in:
Juan RP 2015-02-19 16:38:30 +01:00
parent a166be8465
commit a762a716be
8 changed files with 9 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/build_style/cmake.sh
View File

@ -46,8 +46,6 @@ do_install() {
: ${make_cmd:=make} : ${make_cmd:=make}
: ${make_install_target:=install} : ${make_install_target:=install}
make_install_args+=" DESTDIR=${DESTDIR}"
cd build cd build
${make_cmd} ${make_install_args} ${make_install_target} ${make_cmd} DESTDIR=${DESTDIR} ${make_install_args} ${make_install_target}
} }

4
common/build_style/configure.sh
View File

@ -18,7 +18,5 @@ do_install() {
: ${make_cmd:=make} : ${make_cmd:=make}
: ${make_install_target:=install} : ${make_install_target:=install}
make_install_args+=" DESTDIR=${DESTDIR}" ${make_cmd} DESTDIR=${DESTDIR} ${make_install_args} ${make_install_target}
${make_cmd} ${make_install_args} ${make_install_target}
} }

4
common/build_style/gnu-configure.sh
View File

@ -17,7 +17,5 @@ do_install() {
: ${make_cmd:=make} : ${make_cmd:=make}
: ${make_install_target:=install} : ${make_install_target:=install}
make_install_args+=" DESTDIR=${DESTDIR}" ${make_cmd} DESTDIR=${DESTDIR} ${make_install_args} ${make_install_target}
${make_cmd} ${make_install_args} ${make_install_target}
} }

4
common/build_style/gnu-makefile.sh
View File

@ -14,7 +14,5 @@ do_install() {
: ${make_cmd:=make} : ${make_cmd:=make}
: ${make_install_target:=install} : ${make_install_target:=install}
make_install_args+=" STRIP=: PREFIX=/usr DESTDIR=${DESTDIR}" ${make_cmd} STRIP=true PREFIX=/usr DESTDIR=${DESTDIR} ${make_install_args} ${make_install_target}
${make_cmd} ${make_install_args} ${make_install_target}
} }

4
common/build_style/perl-module.sh
View File

@ -58,7 +58,5 @@ do_install() {
: ${make_cmd:=make} : ${make_cmd:=make}
: ${make_install_target:=install} : ${make_install_target:=install}
make_install_args+=" DESTDIR=${DESTDIR}" ${make_cmd} DESTDIR=${DESTDIR} ${make_install_args} ${make_install_target}
${make_cmd} ${make_install_args} ${make_install_target}
} }

5
common/build_style/python-module.sh
View File

@ -30,8 +30,6 @@ do_install() {
: ${python_versions:=2.7} : ${python_versions:=2.7}
local pyver= pysufx= local pyver= pysufx=
make_install_args+=" --prefix=/usr --root=$DESTDIR"
for pyver in $python_versions; do for pyver in $python_versions; do
if [ -n "$CROSS_BUILD" ]; then if [ -n "$CROSS_BUILD" ]; then
PYPREFIX="$XBPS_CROSS_BASE" PYPREFIX="$XBPS_CROSS_BASE"
@ -47,7 +45,8 @@ do_install() {
LDFLAGS="$LDFLAGS" python${pyver} setup.py \ LDFLAGS="$LDFLAGS" python${pyver} setup.py \
build --build-base=build-${pyver} install ${make_install_args} build --build-base=build-${pyver} install ${make_install_args}
else 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 fi
done done
} }

4
common/build_style/waf.sh
View File

@ -10,7 +10,5 @@ do_build() {
} }
do_install() { do_install() {
make_install_args+=" --destdir=${DESTDIR}" python waf install --destdir=${DESTDIR} ${make_install_args}
python waf install ${make_install_args}
} }

4
common/build_style/waf3.sh
View File

@ -10,7 +10,5 @@ do_build() {
} }
do_install() { do_install() {
make_install_args+=" --destdir=$DESTDIR" PYTHON=python3 python3 waf install --destdir=${DESTDIR} ${make_install_args}
PYTHON=python3 python3 waf install ${make_install_args}
} }