From aed0f3ee0efbaa6db22e9f3d22b5ff5f80bdc7a5 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Wed, 14 Jan 2015 14:22:18 +0100
Subject: [PATCH] xbps-src: fix hooks that are expected to be used in subpkgs.

---
 common/hooks/post-install/98-lib32.sh         | 2 +-
 common/hooks/pre-install/00-lib32.sh          | 2 +-
 common/xbps-src/libexec/xbps-src-doinstall.sh | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/hooks/post-install/98-lib32.sh b/common/hooks/post-install/98-lib32.sh
index 00b92b4e239..a1c66e65f68 100644
--- a/common/hooks/post-install/98-lib32.sh
+++ b/common/hooks/post-install/98-lib32.sh
@@ -2,6 +2,6 @@
 
 hook() {
 	if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
-		rm -f ${DESTDIR}/usr/lib32
+		rm -f ${PKGDESTDIR}/usr/lib32
 	fi
 }
diff --git a/common/hooks/pre-install/00-lib32.sh b/common/hooks/pre-install/00-lib32.sh
index b0e1f29fa1a..199856bab1a 100644
--- a/common/hooks/pre-install/00-lib32.sh
+++ b/common/hooks/pre-install/00-lib32.sh
@@ -3,6 +3,6 @@
 hook() {
 	if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
 		vmkdir usr/lib
-		ln -sf lib ${DESTDIR}/usr/lib32
+		ln -sf lib ${PKGDESTDIR}/usr/lib32
 	fi
 }
diff --git a/common/xbps-src/libexec/xbps-src-doinstall.sh b/common/xbps-src/libexec/xbps-src-doinstall.sh
index d3054d957fb..777643cd979 100755
--- a/common/xbps-src/libexec/xbps-src-doinstall.sh
+++ b/common/xbps-src/libexec/xbps-src-doinstall.sh
@@ -88,8 +88,8 @@ if [ ! -f $XBPS_SUBPKG_INSTALL_DONE ]; then
 
         install -d $PKGDESTDIR
         if declare -f pkg_install >/dev/null; then
-            run_pkg_hooks pre-install
             export XBPS_PKGDESTDIR=1
+            run_pkg_hooks pre-install
             run_func pkg_install
         fi
     fi