From 9d29d2d0019ed9373cc8b872ee6e2bd0b858b6a7 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Fri, 19 Feb 2010 07:18:22 +0100
Subject: [PATCH] xbps-src: repair build/configure targets in chroot.

--HG--
extra : convert_revision : b4a21b4621d0114a22eaf686a60896f3f088a69e
---
 xbps-src/xbps-src.sh.in | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/xbps-src/xbps-src.sh.in b/xbps-src/xbps-src.sh.in
index 8f56c9b49b5..4afcac16c12 100644
--- a/xbps-src/xbps-src.sh.in
+++ b/xbps-src/xbps-src.sh.in
@@ -175,12 +175,14 @@ fi
 case "$target" in
 build|configure)
 	. $XBPS_SHUTILSDIR/tmpl_funcs.sh
-	setup_tmpl $(basename_cwd)
+	[ ! -r ./template ] && msg_error "missing build template file."
+	. ./template
 
 	if [ -z "$base_chroot" -a -z "$in_chroot" ]; then
 		. $XBPS_SHUTILSDIR/chroot.sh
-		xbps_chroot_handler $target $pkgname
+		xbps_chroot_handler $target $(basename_cwd)
 	else
+		setup_tmpl $(basename_cwd)
 		. $XBPS_SHUTILSDIR/fetch_funcs.sh
 		fetch_distfiles
 		if [ ! -f "$XBPS_EXTRACT_DONE" ]; then