From cbbb600a20826bce661b892d8e8bbc35e672a204 Mon Sep 17 00:00:00 2001
From: Rene Rebe <rene.rebe@gmx.net>
Date: Mon, 8 Sep 2003 03:12:54 +0000
Subject: [PATCH] fix for regression caused by my python build support

git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@1335 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
---
 scripts/functions | 35 ++++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/scripts/functions b/scripts/functions
index d3718ae5e..f7abe6893 100644
--- a/scripts/functions
+++ b/scripts/functions
@@ -523,18 +523,24 @@ build_this_package() {
 				eval_config_command $( eval echo $confopt )
 			  fi
 			fi
-			#
-			if [ ! -f Makefile -a ! -f makefile -a \
-			     -f Makefile.PL -a $runmkpl = 1 ]; then
-				perl Makefile.PL
-			fi
-			#
-			if [ ! -f Makefile -a ! -f makefile -a \
-			     -f Imakefile -a $runxmkmf = 1 ]; then
-				xmkmf -a
-			fi
-			#
-			if [ -f Makefile -o -f makefile ] ; then
+
+			# automated package build
+
+			# styles without make run first:
+			if [ -f setup.py  ] ; then
+				pyconfopt="${pyconfopt:=--prefix $root/$prefix}"
+				eval python setup.py build install $pyconfopt
+			else # styles that include a make run
+				if [ ! -f Makefile -a ! -f makefile -a \
+				     -f Makefile.PL -a $runmkpl = 1 ]; then
+					perl Makefile.PL
+				fi
+				#
+				if [ ! -f Makefile -a ! -f makefile -a \
+				     -f Imakefile -a $runxmkmf = 1 ]; then
+					xmkmf -a
+				fi
+				#
 				# Build it
 				#		
 				hook_eval premake
@@ -544,11 +550,6 @@ build_this_package() {
 				if [ "$makeinstopt" ]
 				then eval "$MAKE $makeinstopt"; fi
 				hook_eval postmake
-			elif [ -f setup.py  ] ; then
-				pyconfopt="${pyconfopt:=--prefix $root/$prefix}"
-				eval python setup.py build install $pyconfopt
-			else
-				abort "Build type not determined / supported!"
 
 			fi
 		else