summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean Delvare <khali@linux-fr.org>2005-09-06 16:39:25 +0000
committerJean Delvare <khali@linux-fr.org>2005-09-06 16:39:25 +0000
commit0b85f3bcf966687c7e93029ff862bbabb6c99d14 (patch)
tree219285a7f0fb0e609694bede538ecf8bd7a43cb6
parent3201f0f38d25b73258575f6e2e651b7049432e1f (diff)
downloadquilt-0b85f3bcf966687c7e93029ff862bbabb6c99d14.tar.gz
- Makefile.in: Filter out expanded $EDITOR in quilt.1. This value being
set at installation time may be irrelevant at execution time.
-rw-r--r--Makefile.in3
-rw-r--r--quilt.changes7
2 files changed, 9 insertions, 1 deletions
diff --git a/Makefile.in b/Makefile.in
index 3afa156..d03a2ff 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -153,7 +153,8 @@ doc/quilt.1: doc/quilt.1.in $(QUILT:%=quilt/%)
grep -v 'Usage: quilt' | \
sed -e $$'s/^\t//' \
-e $$'s/\t/\\\n/' | \
- sed -e 's/^\(-.*\)$$/.IP " \1" 8/';\
+ sed -e 's/^\(-.*\)$$/.IP " \1" 8/' \
+ -e 's/\$$EDITOR ([^)]*)/$$EDITOR/'; \
echo; \
done \
;; \
diff --git a/quilt.changes b/quilt.changes
index 87ce53e..e92b354 100644
--- a/quilt.changes
+++ b/quilt.changes
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Tue Sep 6 18:35:18 CEST 2005 - khali@linux-fr.org
+
+- Makefile.in: Filter out expanded $EDITOR in quilt.1. This value
+ being set at installation time may be irrelevant at execution
+ time.
+
+-------------------------------------------------------------------
Tue Sep 6 11:17:10 CEST 2005 - agruen@suse.de
- Fix test/perms.test for LANG=POSIX (from John Vandenberg