From 01ecdbde33cb7e3ead33b797ede1d197304c6cdf Mon Sep 17 00:00:00 2001
From: Christian Wiese <chris@opensde.org>
Date: Wed, 25 May 2011 14:54:03 +0200
Subject: [PATCH] lib/functions.in: improved scons build handling to not run a
 separate 'scons install' which will lead to have the sources build twice

---
 lib/functions.in | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/lib/functions.in b/lib/functions.in
index 26fd737..9217ff9 100644
--- a/lib/functions.in
+++ b/lib/functions.in
@@ -977,9 +977,6 @@ build_this_package() {
 				hook_eval premake
 				eval ${sconsscript:-scons} $sconsopt
 				hook_eval inmake
-				if [ "$sconsinstopt" ]; then
-					eval ${sconsscript:-scons} $sconsinstopt
-				fi
 				hook_eval postmake
 			else # styles that include a make run
 				if [ ! -f Makefile -a ! -f makefile -a \
@@ -1175,8 +1172,7 @@ init_vars_and_hooks()
 	cmakeopt='-DCMAKE_INSTALL_PREFIX="$root/$prefix"'
 	cmakeopt="$cmakeopt"' -DCMAKE_LIBRARY_PATH="$libdir"'
 	# some scons based builds are using 'prefix' others 'PREFIX'
-	sconsopt='PREFIX=/$prefix prefix=/$prefix'
-	sconsinstopt="$sconsopt"' install'
+	sconsopt='PREFIX=/$prefix prefix=/$prefix install'
 
 	if atstage toolchain; then
 		makeopt="$makeopt"' prefix="$root${prefix:+/$prefix}"'
@@ -1201,7 +1197,7 @@ init_vars_and_hooks()
 		makeopt="$makeopt"' DESTDIR="$root" DEST_DIR="$root"'
 		makeopt="$makeopt"' INSTROOT="$root" INSTALLROOT="$root"'
 		# scons based build
-		sconsinstopt="$sconsinstopt"' DESTDIR="$root"'
+		sconsopt='DESTDIR="$root" '"$sconsopt"
 	fi
 	makeinstopt="$makeopt"' install'