summary refs log tree commit diff
diff options
context:
space:
mode:
authorEelco Dolstra <e.dolstra@tudelft.nl>2008-04-10 09:54:23 +0000
committerEelco Dolstra <e.dolstra@tudelft.nl>2008-04-10 09:54:23 +0000
commit658816ddc9b6c22ddb9de27b82fc15af2a473723 (patch)
tree2357f56d7e3cf092952c3fbb75bab3a7cdcfe3eb
parent72034ab35d5ba8c2b229fe36375a15b2a8b5b68c (diff)
downloadguix-658816ddc9b6c22ddb9de27b82fc15af2a473723.tar.gz
* Make really sure that we use bash. The line
    NEED_PROG(shell, bash)

  actually uses the content of $shell if set, which often points at
  /bin/sh.

-rw-r--r--configure.ac2
-rw-r--r--substitute.mk2
2 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index 137f4dbf2a..f12ac0c486 100644
--- a/configure.ac
+++ b/configure.ac
@@ -124,7 +124,7 @@ fi
 ])
 
 NEED_PROG(curl, curl)
-NEED_PROG(shell, bash)
+NEED_PROG(bash, bash)
 NEED_PROG(patch, patch)
 AC_PATH_PROG(xmllint, xmllint, false)
 AC_PATH_PROG(xsltproc, xsltproc, false)
diff --git a/substitute.mk b/substitute.mk
index bdc9c43501..ed60c53a89 100644
--- a/substitute.mk
+++ b/substitute.mk
@@ -9,7 +9,7 @@
 	 -e "s^@libexecdir\@^$(libexecdir)^g" \
 	 -e "s^@storedir\@^$(storedir)^g" \
 	 -e "s^@system\@^$(system)^g" \
-	 -e "s^@shell\@^$(shell)^g" \
+	 -e "s^@shell\@^$(bash)^g" \
 	 -e "s^@curl\@^$(curl)^g" \
 	 -e "s^@bzip2\@^$(bzip2_bin)/bzip2^g" \
 	 -e "s^@bunzip2\@^$(bzip2_bin)/bunzip2^g" \