X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=userv.git;a=blobdiff_plain;f=Makefile.in;h=5b5ba96ef8ad9ff13adfb865751fb061e1ae6bab;hp=115ab4ab78256a6c7080b226c750d5e4e41da381;hb=b613cadfdf189af1f4ee0b5bdc12cedda052c672;hpb=25fb518076d49f38e12431861e3cb8dd050955ed

diff --git a/Makefile.in b/Makefile.in
index 115ab4a..5b5ba96 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -44,7 +44,7 @@ SOURCES=	Makefile.in configure.in acconfig.h			\
 ALSOSHIP=	system.default system.override \
 		spec.sgml overview.fig overview.ps \
 		COPYING buildship install-sh .cvsignore
-GENSHIP=	lexer.l lexer.c tokens.h pcsum.h \
+GENSHIP=	lexer.l lexer.c tokens.h configure config.h.in \
 		spec.html spec.ps overview.ps
 
 SHIPTARGETS=	$(SOURCES) $(ALSOSHIP) $(GENSHIP)
@@ -64,7 +64,7 @@ daemon:		daemon.o parserlexer.o ddebug.o lib.o
 
 lexer.l:	language.i4
 
-client.o:	config.h common.h pcsum.h
+client.o:	config.h common.h pcsum.h version.h
 
 daemon.o:	config.h common.h pcsum.h daemon.h lib.h tokens.h
 
@@ -76,9 +76,9 @@ parserlexer.o:	lexer.c parser.c config.h common.h pcsum.h daemon.h lib.h tokens.
 # lexer.c #include's parser.c at the end.  Blame flex.
 		$(CC) -c $(CPPFLAGS) $(CFLAGS) lexer.c -o $@
 
-pcsum.h:	common.h
-		md5sum common.h | perl -pe 's/../0x$$&,/g; s/,$$//;' \
-			>pcsum.h.new && mv pcsum.h.new pcsum.h
+pcsum.h:	common.h version.h config.h config.status Makefile
+		cat $^ | md5sum | sed -e 's/../0x&,/g; s/,$$//;' >pcsum.h.new
+		cmp pcsum.h.new pcsum.h || mv -f pcsum.h.new pcsum.h
 
 tokens.h:	language.i4
 
@@ -102,10 +102,12 @@ realclean:	distclean
 shipprep:	$(SHIPTARGETS)
 
 ship:		$(SHIPTARGETS)
-		rm -rf d && mkdir d && cp -av $^ d
-		mv d userv-$(VERSION)
-		GZIP=-9v tar zvvcf ../userv-$(VERSION).tar.gz userv-$(VERSION)
-		rm -rf userv-$(VERSION)
+		rm -rf shipcheck
+		mkdir -p shipcheck/userv-$(VERSION)
+		cp -a $^ shipcheck/userv-$(VERSION)
+		cd shipcheck && \
+		 GZIP=-9v tar zvvcf userv-$(VERSION).tar.gz userv-$(VERSION)
+		rm -rf shipcheck/userv-$(VERSION)
 
 linecount:	$(SOURCES)
 		wc -l $^