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