[pacman-dev] [PATCH 3/3] Do not require full path for scriptlet shell

Allan McRae allan at archlinux.org
Sun Jul 15 21:41:29 EDT 2012


This increases robustness to the shell location changing paths.

Signed-off-by: Allan McRae <allan at archlinux.org>
---
 configure.ac | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 5483ee1..6f53c72 100644
--- a/configure.ac
+++ b/configure.ac
@@ -95,8 +95,8 @@ AC_ARG_WITH(buildscript,
 # Help line for changing shell used to run install scriptlets
 AC_ARG_WITH(scriptlet-shell,
 	AS_HELP_STRING([--with-scriptlet-shell=shell],
-		[set the full path to the shell used to run install scriptlets]),
-	[SCRIPTLET_SHELL=$withval], [SCRIPTLET_SHELL=/bin/sh])
+		[set the shell used to run install scriptlets]),
+	[SCRIPTLET_SHELL=$withval], [SCRIPTLET_SHELL=sh])
 
 # Help line for using OpenSSL
 AC_ARG_WITH(openssl,
@@ -447,7 +447,7 @@ AC_SUBST(BUILDSCRIPT)
 AC_DEFINE_UNQUOTED([BUILDSCRIPT], "$BUILDSCRIPT", [The build script name used by makepkg])
 # Set shell used by install scriptlets
 AC_SUBST(SCRIPTLET_SHELL)
-AC_DEFINE_UNQUOTED([SCRIPTLET_SHELL], "$SCRIPTLET_SHELL", [The full path of the shell used to run install scriptlets])
+AC_DEFINE_UNQUOTED([SCRIPTLET_SHELL], "$SCRIPTLET_SHELL", [The shell used to run install scriptlets])
 
 # Configuration files
 AC_CONFIG_FILES([
-- 
1.7.11.2



More information about the pacman-dev mailing list