diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | scripts/Makefile | 15 |
2 files changed, 9 insertions, 13 deletions
@@ -1,5 +1,10 @@ 2002-01-12 Fumitoshi UKAI <ukai@debian.or.jp> + * [w3m-dev 02827] + * scripts/Makefile: use sed instead of /bin/sh while read; echo loop + +2002-01-12 Fumitoshi UKAI <ukai@debian.or.jp> + * [w3m-dev 02823] * scripts/Makefile: don't use read -r because Solaris 8 for x86 doesn't work @@ -1865,4 +1870,4 @@ * release-0-2-1 * import w3m-0.2.1 -$Id: ChangeLog,v 1.209 2002/01/11 20:51:21 ukai Exp $ +$Id: ChangeLog,v 1.210 2002/01/12 11:44:09 ukai Exp $ diff --git a/scripts/Makefile b/scripts/Makefile index e1efdc9..c7057b5 100644 --- a/scripts/Makefile +++ b/scripts/Makefile @@ -33,18 +33,11 @@ all: $(LIB_TARGETS) $(HELP_LIBS) w3mhelp-funcname.pl: w3mhelp-funcname.pl.in ../funcname.tab ../doc/keymap.default ../doc/keymap.lynx @echo "generating w3mhelp-funcname.pl..." @echo '%funcname = (' > w3mhelp-funcname.pl - @while read fname fid; do \ - case "$$fname" in [a-zA-Z@]*) echo "'$$fname', '$$fid',";; esac; \ - done < ../funcname.tab >> w3mhelp-funcname.pl + @sed -ne "/^[a-zA-Z@]/s/\([a-zA-Z@][a-zA-Z0-9@_]*\)[ ][ ]*\([^ ]*\)/'\1', '\2',/p" < ../funcname.tab >> w3mhelp-funcname.pl @echo ');' >> w3mhelp-funcname.pl @echo '%keyfunc = (' >> w3mhelp-funcname.pl @case "$(KEYBIND_SRC)" in *lynx*) keymap=keymap.lynx;; *) keymap=keymap.default;; esac; \ - while read keyword keys func rest; do \ - if [ "X$$keyword" = Xkeymap ]; then \ - keys=`echo "$$keys" | sed -e 's/[\\"\\\\^]/\\\\&/g'`; \ - echo "'$$keys', '$$func',"; \ - fi; \ - done < ../doc/$$keymap >> w3mhelp-funcname.pl + sed -ne "/^keymap/s/^keymap[ ][ ]*\([^ ]*\)[ ][ ]*\([a-zA-Z@][a-zA-Z0-9@_]*\)/'\1', '\2', /p" < ../doc/$$keymap >> w3mhelp-funcname.pl @echo ');' >> w3mhelp-funcname.pl @cat w3mhelp-funcname.pl.in >> w3mhelp-funcname.pl @echo "done" @@ -56,9 +49,7 @@ w3mhelp-funcdesc-stamp: dir=`expr "$$dirlang" : "\(.*\):.*"`; \ lang=`expr "$$dirlang" : ".*:\(.*\)_.*"`; \ echo '%funcdesc = (' > w3mhelp-funcdesc.$$lang.pl; \ - while read func desc; do \ - case "$$func" in [a-zA-Z@]*) echo "'$$func', '$$desc', ";; esac; \ - done < ../$$dir/README.func >> w3mhelp-funcdesc.$$lang.pl; \ + sed -ne "/^[a-zA-Z@]/s/\([a-zA-Z@][a-zA-Z0-9@_]*\)[ ][ ]*\(.*\)/'\1', '\2',/p" < ../$$dir/README.func >> w3mhelp-funcdesc.$$lang.pl; \ echo ');' >> w3mhelp-funcdesc.$$lang.pl; \ cat w3mhelp-funcdesc.$$lang.pl.in >> w3mhelp-funcdesc.$$lang.pl; \ done |