From c58a2bad9cdf38662b45a91e670230b43bb47362 Mon Sep 17 00:00:00 2001 From: "Tom G. Christensen" Date: Sun, 26 Feb 2006 12:28:28 +0000 Subject: [PATCH] Add EGREP Allow overriding the makefile build target to use Allow skipping the configure step in generic_build --- buildpkg.functions | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/buildpkg.functions b/buildpkg.functions index 6257059..3c17dbe 100644 --- a/buildpkg.functions +++ b/buildpkg.functions @@ -56,6 +56,7 @@ MKDIR=/usr/bin/mkdir CP=/usr/bin/cp TEE=/bin/tee GREP=/bin/grep +EGREP=/bin/egrep UNIQ=/bin/uniq BASENAME=/bin/basename DIRNAME=/bin/dirname @@ -139,6 +140,13 @@ custom_install=0 # but if set to 0 it will try to use run_configure function instead generic_configure=1 +# Allow overriding the make target for building +# We default to an empty string so the default target will be built +make_build_target="" + +# Allow skipping the configure run +no_configure=0 + # Distfiles should be named like this # --.sb--- # ie: libmad-0.14.2b-1.sb-sol5.8-sparcv9-local @@ -603,16 +611,18 @@ generic_build() { setdir ${srcdir}/${topsrcdir}/$1 - if [ $generic_configure -eq 1 ]; then - ./configure $(_upls $configure_args) - else - # Platform specific configure run - run_configure + if [ $no_configure -eq 0 ]; then + if [ $generic_configure -eq 1 ]; then + ./configure $(_upls $configure_args) + else + # Platform specific configure run + run_configure + fi fi if [ $? -ne 0 ]; then error $E_BAD_CONFIG generic_build fi - $MAKE_PROG + $MAKE_PROG $(_upls $make_build_target) if [ $? -ne 0 ]; then error $E_BAD_MAKE generic_build fi