w3m

commit 58bfcc6f039e93807a879cfe162471ac30512abb
parent a2279d28cc6da661388a0f5008b3ae95b0163eb1
Author: ukai <ukai>
Date:   Sat, 12 Jan 2002 11:44:09 +0000

[w3m-dev 02827]
From: Fumitoshi UKAI  <ukai@debian.or.jp>

Diffstat:
M
ChangeLog
 | 
5
+++++
M
scripts/Makefile
 | 
15
+++------------

2 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -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
diff --git 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