From a405c67ef7a89bd16c611b4d1aabaac0f714cc52 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sat, 16 Jul 2011 10:25:06 +0200 Subject: [PATCH] xbps-src: do_configure func can now be used in custom-install tmpls. --- xbps-src/shutils/configure_funcs.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xbps-src/shutils/configure_funcs.sh b/xbps-src/shutils/configure_funcs.sh index 7c6e1e3b41..d5b77f5a70 100644 --- a/xbps-src/shutils/configure_funcs.sh +++ b/xbps-src/shutils/configure_funcs.sh @@ -42,7 +42,7 @@ do_gnu_configure() ${configure_script} ${CONFIGURE_SHARED_ARGS} ${configure_args} } -do_configure() +do_nongnu_configure() { # # Packages using custom configure scripts. @@ -72,12 +72,11 @@ configure_src_phase() fi # - # Skip this phase for: meta-template, only-install, custom-install, + # Skip this phase for: meta-template, only-install, # gnu_makefile and python-module style builds. # [ "$build_style" = "meta-template" -o \ "$build_style" = "only-install" -o \ - "$build_style" = "custom-install" -o \ "$build_style" = "gnu_makefile" -o \ "$build_style" = "python-module" ] && return 0 @@ -107,8 +106,9 @@ configure_src_phase() case "$build_style" in gnu_configure|gnu-configure) run_func do_gnu_configure ;; - configure) run_func do_configure ;; + configure) run_func do_nongnu_configure ;; perl-module|perl_module) run_func do_perl_configure ;; + custom-install) run_func do_configure;; *) # # Unknown build_style type won't work :-)