Re: merged Makefile fixes

[Zefram <zefram@xxxxxxxxxxxxxxxxx>]

-----BEGIN PGP SIGNED MESSAGE-----

Zoltan Hidvegi wrote:
>And it also assumes that the `.' builtin set positional parameters.

I noticed that problem too.

>! 	srcdir='$(srcdir)' CFSED='$(CFSED)' MODBINS='$(MODBINS)' \
>! 	XMODCF='$(XMODCF)' $(SHELL) $(srcdir)/mkbltnmlst.sh $@

I think my solution is more readable.  (It is also marginally more
efficient.)

 -zefram

 *** Src/Makefile.in	1997/01/02 20:19:15	1.33
 --- Src/Makefile.in	1997/01/03 05:21:17
 ***************
 *** 212,222 ****
   	fi
   
   bltinmods.list: $(MODBINS) $(XMODCF) mkbltnmlst.sh
   	srcdir='$(srcdir)'; \
   	CFSED='$(CFSED)'; \
   	MODBINS='$(MODBINS)'; \
   	XMODCF='$(XMODCF)'; \
 ! 	. $(srcdir)/mkbltnmlst.sh $@
   
   zshxmods.h: $(MODBINS) $(XMODCF)
   	@echo "Creating \`$@'."
 --- 212,223 ----
   	fi
   
   bltinmods.list: $(MODBINS) $(XMODCF) mkbltnmlst.sh
 + 	TARGET='$@'; \
   	srcdir='$(srcdir)'; \
   	CFSED='$(CFSED)'; \
   	MODBINS='$(MODBINS)'; \
   	XMODCF='$(XMODCF)'; \
 ! 	. $(srcdir)/mkbltnmlst.sh
   
   zshxmods.h: $(MODBINS) $(XMODCF)
   	@echo "Creating \`$@'."
 ***************
 *** 249,262 ****
   $(PROTO): makepro.sed
   
   $(NSTMP): $(MODBINS) $(MODCF) mkstamp.sh proto FORCE
 ! 	@srcdir='$(srcdir)'; \
   	CFSED='$(CFSED)'; \
   	MODBINS='$(MODBINS)'; \
   	MODCF='$(MODCF)'; \
   	MODULE_DIRS='$(MODULE_DIRS)'; \
   	MAKE='$(MAKE)'; \
   	MAKEDEFS="$(MAKEDEFS)"; \
 ! 	. $(srcdir)/mkstamp.sh $@
   
   FORCE:
   
 --- 250,264 ----
   $(PROTO): makepro.sed
   
   $(NSTMP): $(MODBINS) $(MODCF) mkstamp.sh proto FORCE
 ! 	@TARGET='$@'; \
 ! 	srcdir='$(srcdir)'; \
   	CFSED='$(CFSED)'; \
   	MODBINS='$(MODBINS)'; \
   	MODCF='$(MODCF)'; \
   	MODULE_DIRS='$(MODULE_DIRS)'; \
   	MAKE='$(MAKE)'; \
   	MAKEDEFS="$(MAKEDEFS)"; \
 ! 	. $(srcdir)/mkstamp.sh
   
   FORCE:
   
 *** Src/mkbltnmlst.sh	1997/01/02 20:20:44	1.3
 --- Src/mkbltnmlst.sh	1997/01/03 05:20:40
 ***************
 *** 4,9 ****
 --- 4,10 ----
   #
   # Written by Andrew Main
   #
 + TARGET=${TARGET-bltinmods.list}
   srcdir=${srcdir-`echo $0|sed 's%/[^/][^/]*$%%'`}
   test "x$srcdir" = "x$0" && srcdir=.
   test "x$srcdir" = "x"   && srcdir=.
 ***************
 *** 16,23 ****
       p
   }'
   xmods=`sed -n $CFSED -e "$sed" $XMODCF`
 ! trap "rm -f $1; exit 1" 1 2 15
 ! exec > $1
   for mod in $xmods; do
       case $binmods in
   	*" $mod "*) ;;
 --- 17,24 ----
       p
   }'
   xmods=`sed -n $CFSED -e "$sed" $XMODCF`
 ! trap 'rm -f "$TARGET"; exit 1' 1 2 15
 ! exec > "$TARGET"
   for mod in $xmods; do
       case $binmods in
   	*" $mod "*) ;;
 ***************
 *** 58,64 ****
   	    *" $dep "*)
   		echo "    /* depends on \`$dep' */" ;;
   	    *)	echo >&2 "ERROR: linked-in module \`$mod' depends on \`$dep'"
 ! 		rm -f $1
   		exit 1 ;;
   	esac
       done
 --- 59,65 ----
   	    *" $dep "*)
   		echo "    /* depends on \`$dep' */" ;;
   	    *)	echo >&2 "ERROR: linked-in module \`$mod' depends on \`$dep'"
 ! 		rm -f "$TARGET"
   		exit 1 ;;
   	esac
       done
 *** Src/mkstamp.sh	1997/01/02 20:20:44	1.3
 --- Src/mkstamp.sh	1997/01/03 05:22:17
 ***************
 *** 4,9 ****
 --- 4,10 ----
   #
   # Written by Andrew Main
   #
 + TARGET=${TARGET-stamp-modobjs}
   srcdir=${srcdir-`echo $0|sed 's%/[^/][^/]*$%%'`}
   test "x$srcdir" = "x$0" && srcdir=.
   test "x$srcdir" = "x"   && srcdir=.
 ***************
 *** 12,18 ****
   MODCF=${MODCF-$srcdir/mods.conf}
   MODULE_DIRS=${MODULE_DIRS-'Modules Zle'}
   MAKE=${MAKE-make}
 ! STMP=$1
   
   act="rm -f `pwd`/$STMP"
   trap "rm -f $STMP.tmp; exit 1" 1 2 15
 --- 13,19 ----
   MODCF=${MODCF-$srcdir/mods.conf}
   MODULE_DIRS=${MODULE_DIRS-'Modules Zle'}
   MAKE=${MAKE-make}
 ! STMP=$TARGET
   
   act="rm -f `pwd`/$STMP"
   trap "rm -f $STMP.tmp; exit 1" 1 2 15

-----BEGIN PGP SIGNATURE-----
Version: 2.6.3i
Charset: ascii

iQCVAwUBMsznH3D/+HJTpU/hAQFJ8AQAkxGOv29Ei4HZ7mnsJC2GEKWVtFW3BCp4
PgcczT21h6BPSkP1HWSiBVxChZzovs1Ufe7P5wBeZ+hsq+97RqzMlk7g80kN2ue+
kT92HeZ/FWM6GSYkvIi+PIYNFjU++Eqj9g2roZPRFONWE0wbLuV3p9b/igDl2KBR
4lnQ4GA9FEc=
=j8CR
-----END PGP SIGNATURE-----