summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrmax <rmax>2004-11-19 09:46:30 (GMT)
committerrmax <rmax>2004-11-19 09:46:30 (GMT)
commit7e3c4ca5d96416c79598d4afe7b3b3dc6705c545 (patch)
tree9cd49fc9f8066be9f0036de7e9cf11878795d836
parent179271fd8f849623c7c5553964559745f765ac30 (diff)
downloadtk-7e3c4ca5d96416c79598d4afe7b3b3dc6705c545.zip
tk-7e3c4ca5d96416c79598d4afe7b3b3dc6705c545.tar.gz
tk-7e3c4ca5d96416c79598d4afe7b3b3dc6705c545.tar.bz2
Classic sed doesn't support | in REs.
-rw-r--r--ChangeLog10
-rwxr-xr-xunix/installManPage7
2 files changed, 14 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 91030eb..ba4d247 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,15 @@
-2004-11-18 Don Porter <dgp@users.sourceforge.net>
+2004-11-19 Reinhard Max <max@suse.de>
+
*** 8.4.8 TAGGED FOR RELEASE ***
+ * unix/installManPage: Classic sed doesn't support | in REs.
+
+ * doc/pack-old.n: Changed the internal name of the man page to
+ pack-old to avoid a name clash in the installed man pages.
+
+2004-11-18 Don Porter <dgp@users.sourceforge.net>
+
* changes: Final updates for Tcl 8.4.8 release.
2004-11-18 Reinhard Max <max@suse.de>
diff --git a/unix/installManPage b/unix/installManPage
index 4157d26..93fd925 100755
--- a/unix/installManPage
+++ b/unix/installManPage
@@ -25,10 +25,12 @@ test -z "$S" && S="$DIR/"
# /^\\.SH NAME/{ ;# Look for a line, that starts with .SH NAME
# s/^.*$// ;# Delete the content of this line from the buffer
# n ;# Read next line
-# s/,\|\\\ //g ;# Remove all commas
+# s/,//g ;# Remove all commas ...
+# s/\\\ //g ;# .. and backslash-escaped spaces.
# s/ \\\-.*// ;# Delete from \- to the end of line
# p ;# print the result
# q ;# exit
+# }
#
# Backslashes are trippled in the sed script, because it is in
# backticks which don't pass backslashes literally.
@@ -39,7 +41,8 @@ NAMES=`sed -n '
/^\\.SH NAME/{
s/^.*$//
n
- s/,\|\\\ //g
+ s/,//g
+ s/\\\ //g
s/ \\\-.*//
p
q