From e13b08218a7c99ea43559d2b817fede3bcfad860 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 22 Oct 2008 04:08:46 +0200 Subject: [PATCH] Set and unset compilation vars in all phases not just configure. --HG-- extra : convert_revision : 8260a0608d8e90720c27139c76b4bf70830da12b --- xbps.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/xbps.sh b/xbps.sh index f024222b59..49ed3425d7 100755 --- a/xbps.sh +++ b/xbps.sh @@ -769,6 +769,8 @@ configure_src_phase() # Override libtool scripts if necessary fixup_tmpl_libtool + unset_build_vars + $touch_cmd -f $XBPS_CONFIGURE_DONE } @@ -820,6 +822,7 @@ build_src_phase() export "$f" done + set_build_vars # # Build package via make. # @@ -840,6 +843,8 @@ build_src_phase() ${run_stuff_before_install_cmd} unset rbif + unset_build_vars + $touch_cmd -f $XBPS_BUILD_DONE } @@ -855,6 +860,7 @@ install_src_phase() if [ -z "$make_install_target" ]; then make_install_target="install prefix=$XBPS_DESTDIR/$pkgname-$version" + make_install_target="$make_install_target sysconfdir=$XBPS_DESTDIR/$pkgname-$version/etc" fi [ -z "$make_cmd" ] && make_cmd=/usr/bin/make @@ -873,6 +879,7 @@ install_src_phase() echo "=> Running install phase for: $pkgname-$version." + set_build_vars # # Install package via make. #