summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Quinson <martin.quinson@loria.fr>2012-01-09 20:54:32 +0100
committerMartin Quinson <martin.quinson@loria.fr>2012-01-09 20:54:32 +0100
commitc24a5fa8917aabc8b795862ca12d5def54657841 (patch)
tree21be57a0d4e8e241d26feb487df7fef87496f1f6
parent5024191518c701748de14043a1a8a3ff2cae0353 (diff)
downloadquilt-c24a5fa8917aabc8b795862ca12d5def54657841.tar.gz
ensure that bash is used as a shell, even if it's not the default one
-rw-r--r--Makefile.in1
-rw-r--r--quilt.changes10
2 files changed, 11 insertions, 0 deletions
diff --git a/Makefile.in b/Makefile.in
index 797eced..2b2616e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -24,6 +24,7 @@ CP := @CP@
DATE := @DATE@
PERL := @PERL@
BASH := @BASH@
+SHELL:= @BASH@ # It does not work if dash is used as a shell, for example
GREP := @GREP@
TAIL := @TAIL@
TR := @TR@
diff --git a/quilt.changes b/quilt.changes
index b23ae18..4115eb0 100644
--- a/quilt.changes
+++ b/quilt.changes
@@ -1,3 +1,13 @@
+Mon Jan 9 20:49:04 CET 2012 - mquinson@debian.org
+- Makefile.in:
+ - revert the change to fix the generation of quilt.1 with dash
+ It induced relying on GNU sed, which introduce severe portability
+ issues as BSD and Mac OSX versions of sed (at least) cannot deal
+ with \n by themselves.
+ - Force it to use SHELL = @BASH@ to ensure that it works when dash
+ is the default shell (bash is installed anyway since our scripts
+ use it)
+
Mon Jan 2 11:02:38 CET 2012 - mquinson@debian.org
- Makefile.in: Fix auto-generation of quilt.1 to work with dash