diff options
author | Martin Quinson <martin.quinson@loria.fr> | 2012-01-09 20:43:42 +0100 |
---|---|---|
committer | Martin Quinson <martin.quinson@loria.fr> | 2012-01-09 20:43:42 +0100 |
commit | 5024191518c701748de14043a1a8a3ff2cae0353 (patch) | |
tree | 5e30a559832f349f52ef3450c8eb47532d84cfbd | |
parent | 05460ccc47a8afc5cf10256fc52ffacc4d56b100 (diff) | |
download | quilt-5024191518c701748de14043a1a8a3ff2cae0353.tar.gz |
Revert "Fix auto-generation of quilt.1 to work with dash"
This reverts commit 5f17e6f29c22282a4bf2819ac7ee08c942e6e103.
We rely on bash for the rest of quilt, so it is no real issue to rely
on it for the makefile. If we try to remove it, we have to deal with
the portability another way. For example, BSD and Mac OSX versions of
sed are not able to deal with \n by themselves...
The correct fix will be to force the SHELL to be bash in the makefile.
-rw-r--r-- | Makefile.in | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Makefile.in b/Makefile.in index 89249dd..797eced 100644 --- a/Makefile.in +++ b/Makefile.in @@ -197,7 +197,7 @@ doc/README : doc/README.in $(QUILT:%=quilt/%) $(COMPAT) $(MAKE) -s reference \ ;; \ *) \ - printf "%s\n" "$$line" \ + echo $$line \ ;; \ esac ; \ done 2>&1 < $< > $@ @@ -209,15 +209,15 @@ doc/quilt.1: doc/quilt.1.in $(QUILT:%=quilt/%) $(COMPAT) '@REFERENCE''@') \ $(MAKE) -s reference | \ $(SED) -e 's/^quilt \([^ ]*\)\(.*\)/.IP "\\fB\1\\fP\2 " 4/' \ - -e 's/^ \(-[^\t]*\)\t\?/.IP " \1" 8\n/' \ - -e 's/^ \t\?//' \ + -e $$'s/^ \\(-[^\t]*\\)\t\\?/.IP " \\1" 8\\\n/' \ + -e $$'s/^ \t\\?//' \ ;; \ *@DOCSUBDIR@*) \ - printf "%s\n" "$$line" | \ + echo "$$line" | \ $(SED) -e 's:@DOCSUBDIR''@:$(docdir):g' \ ;; \ *) \ - printf "%s\n" "$$line" \ + echo "$$line" \ ;; \ esac; \ done < $< 2>&1 > $@ |