make oddity

[Peter Stephenson <pws@xxxxxxx>]

I had to work around a problem with make in releasing 4.3.11: in
previous releases 'make' from a clean directory performed the equivalent
of 'make prep' in the Src directory, this time it didn't.  I assume that
there's some dependency missing (the standard answer) and that the
timestamps of two files have somehow got out of order so some assumption
isn't valid any more.

Here's the change I committed to work around it (with a later change to
fix a minor unintentional slip with the phony files that it's not worth
updating the release for).  As it works well enough in practice I'm not
going to waste time on it, but maybe somebody can see more quickly than
I can why this step should have happened automatically in everything up to
4.3.10-test-3 but doesn't in the 4.3.11 release without the change.

Index: Makefile.in
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/Makefile.in,v
retrieving revision 1.16
retrieving revision 1.18
diff -p -u -u -r1.16 -r1.18
--- Makefile.in	18 Dec 2010 23:03:20 -0000	1.16
+++ Makefile.in	20 Dec 2010 16:51:25 -0000	1.18
@@ -221,7 +221,10 @@ mostlyclean-modules clean-modules distcl
 
 install.modules uninstall.modules \
 modobjs modules headers proto $(MAIN_OBJS) zsh.export: Makemod
+	@if [ ! -f Builtins/Makefile.in ]; then \
+	   $(MAKE) prep; \
+	fi
 	@$(MAKE) -f Makemod $(MAKEDEFS) $@
-.PHONY: install.modules uninstall.modules
+.PHONY: install.modules uninstall.modules headers proto
 
 $(MAIN_OBJS): $(sdir)/zsh.h

-- 
Peter Stephenson <pws@xxxxxxx>            Software Engineer
Tel: +44 (0)1223 692070                   Cambridge Silicon Radio Limited
Churchill House, Cambridge Business Park, Cowley Road, Cambridge, CB4 0WZ, UK


Member of the CSR plc group of companies. CSR plc registered in England and Wales, registered number 4187346, registered office Churchill House, Cambridge Business Park, Cowley Road, Cambridge, CB4 0WZ, United Kingdom