zsh-workers/9134

Src/Makefile.in

@@ -124,7 +124,7 @@ modules-bltin: Makefile
 	if test -f mymods.conf; then \
 	    cat mymods.conf > $@; \
 	elif test @D@ = N; then \
-	    cat $(sdir)/xmods.conf > $@; \
+	    sed -n '/L.* /{s/^.* //;p;}' < $(sdir)/xmods.conf > $@; \
 	else \
 	    echo > $@; \
 	fi

Src/mkbltnmlst.sh

@@ -12,7 +12,7 @@ MODBINS=${MODBINS-modules-bltin}
 XMODCF=${XMODCF-$srcdir/xmods.conf}
 
 bin_mods=" zsh/main "`sed 's/^/ /;s/$/ /' $MODBINS`
-x_mods=`cat $XMODCF`
+x_mods=`sed 's/^.* //' $XMODCF`
 . ./modules.index
 
 trap "rm -f $1; exit 1" 1 2 15

Src/xmods.conf

@@ -1,29 +1,29 @@
-zsh/rlimits
+L zsh/rlimits
-zsh/zle
+L zsh/zle
-zsh/complete
+L zsh/complete
-zsh/compctl
+L zsh/compctl
-zsh/sched
+L zsh/sched
-zsh/complist
+L zsh/complist
-zsh/zutil
+L zsh/zutil
-zsh/computil
+L zsh/computil
-zsh/parameter
+L zsh/parameter
-zsh/zleparameter
+L zsh/zleparameter
 cap
 clone
-compctl
+L compctl
-complete
+L complete
-complist
+L complist
-computil
+L computil
 deltochar
 example
 files
 mapfile
 mathfunc
-parameter
+L parameter
-rlimits
+L rlimits
-sched
+L sched
 stat
 zftp
-zle
+L zle
-zleparameter
+L zleparameter
-zutil
+L zutil

Src/zsh.mdd

@@ -62,7 +62,7 @@ zshxmods.h: modules-bltin xmods.conf
 	@echo "Creating \`$@'."
 	@( \
 	    binmods=`sed 's/^/ /;s/$$/ /' modules-bltin`; \
-	    for mod in `cat $(sdir_src)/xmods.conf`; do \
+	    for mod in `sed 's/^.* //' $(sdir_src)/xmods.conf`; do \
 		q_mod=`echo $$mod | sed 's,Q,Qq,g;s,_,Qu,g;s,/,Qs,g'`; \
 		case $$binmods in \
 		    *" $$mod "*) \