From 7d60f3d0c2251360581d7cb265f1d6d8155752ec Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 22 Apr 2009 06:18:11 +0200 Subject: [PATCH] Provide $config_shell for templates, by default set to /bin/sh. --HG-- extra : convert_revision : 8630725f3e1d5d8feb54a352d3116197727b69b6 --- shutils/configure_funcs.sh | 6 +++++- shutils/tmpl_funcs.sh | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/shutils/configure_funcs.sh b/shutils/configure_funcs.sh index 9d224cc9fe..1e19971bf8 100644 --- a/shutils/configure_funcs.sh +++ b/shutils/configure_funcs.sh @@ -78,11 +78,15 @@ configure_src_phase() . $XBPS_SHUTILSDIR/buildvars_funcs.sh set_build_vars + if [ -z "${config_shell}" ]; then + config_shell=/bin/sh + fi + # # Packages using GNU autoconf # if [ "$build_style" = "gnu_configure" ]; then - env CONFIG_SHELL=/bin/sh ${configure_script} \ + env CONFIG_SHELL=${config_shell} ${configure_script} \ --prefix=/usr --sysconfdir=/etc \ --infodir=/usr/share/info \ --mandir=/usr/share/man \ diff --git a/shutils/tmpl_funcs.sh b/shutils/tmpl_funcs.sh index f80591f542..ccec69601a 100644 --- a/shutils/tmpl_funcs.sh +++ b/shutils/tmpl_funcs.sh @@ -64,7 +64,7 @@ reset_tmpl_vars() short_desc maintainer long_desc checksum wrksrc \ patch_files make_cmd base_chroot register_shell \ make_build_target configure_script noextract \ - pre_configure pre_build pre_install \ + pre_configure pre_build pre_install config_shell \ post_configure post_build post_install \ make_install_target version revision \ sgml_catalogs xml_catalogs xml_entries sgml_entries \