From: Nicholas Clark <nick@ccl4.org>
Date: Sat, 24 Jan 2009 17:10:08 +0000 (+0000)
Subject: The exit code of make_patchnum.pl is no longer used, so make it return 0.
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=16ad9bfac1f54be805ef4a486e9f58be56a4dcc1;p=p5sagit%2Fp5-mst-13.2.git

The exit code of make_patchnum.pl is no longer used, so make it return 0.
Remove special-casing from all the makefiles that coped with it returning non-0.
---

diff --git a/Makefile.SH b/Makefile.SH
index 6626e59..d601254 100644
--- a/Makefile.SH
+++ b/Makefile.SH
@@ -530,7 +530,7 @@ all: $(FIRSTMAKEFILE) miniperl$(EXE_EXT) miniperl extra.pods $(private) $(unidat
 .PHONY: all translators utilities
 
 git_version.h: miniperl$(EXE_EXT) make_patchnum.pl
-	-$(LDLIBPTH) $(RUN) ./miniperl$(EXE_EXT) -Ilib make_patchnum.pl
+	$(LDLIBPTH) $(RUN) ./miniperl$(EXE_EXT) -Ilib make_patchnum.pl
 
 # make sure that we recompile perl.c if the git version changes
 perl$(OBJ_EXT): git_version.h
diff --git a/make_patchnum.pl b/make_patchnum.pl
index 64a47e8..2bacd4b 100644
--- a/make_patchnum.pl
+++ b/make_patchnum.pl
@@ -150,7 +150,7 @@ git_unpushed='$unpushed_commit_list'";
 }
 
 # we extract the filename out of the warning header, so dont mess with that
-exit(write_files(<<"EOF_HEADER", <<"EOF_CONFIG"));
+write_files(<<"EOF_HEADER", <<"EOF_CONFIG");
 /**************************************************************************
 * WARNING: 'git_version.h' is automatically generated by make_patchnum.pl
 *          DO NOT EDIT DIRECTLY - edit make_patchnum.pl instead
diff --git a/vms/descrip_mms.template b/vms/descrip_mms.template
index 42c0d81..bb4e00e 100644
--- a/vms/descrip_mms.template
+++ b/vms/descrip_mms.template
@@ -375,7 +375,7 @@ all : base extras x2p archcorefiles preplibrary perlpods
 .endif
 
 git_version.h : $(MINIPERL_EXE) make_patchnum.pl
-        - $(MINIPERL) make_patchnum.pl
+        $(MINIPERL) make_patchnum.pl
 
 base : miniperl perl
 	@ $(NOOP)
diff --git a/win32/Makefile b/win32/Makefile
index 409ca91..467944d 100644
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -877,11 +877,9 @@ config.w32 : $(CFGSH_TMPL)
 	-del /f config.h
 	copy $(CFGH_TMPL) config.h
 
-# ignore "errors" from make_patchnum.pl (it exits with status 1 when
-# not rewriting its output files)
 make_patchnum : $(MINIPERL)
 	cd ..
-	-miniperl -Ilib make_patchnum.pl
+	miniperl -Ilib make_patchnum.pl
 	cd win32
 
 ..\git_version.h : ..\stock_git_version.h
diff --git a/win32/makefile.mk b/win32/makefile.mk
index 9814d92..f73670e 100644
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -1125,10 +1125,8 @@ config.w32 : $(CFGSH_TMPL)
 	-del /f config.h
 	copy $(CFGH_TMPL) config.h
 
-# ignore "errors" from make_patchnum.pl (it exits with status 1 when
-# not rewriting its output files)
 make_patchnum : $(MINIPERL)
-	-cd .. && miniperl -Ilib make_patchnum.pl
+	cd .. && miniperl -Ilib make_patchnum.pl
 
 ..\git_version.h : ..\stock_git_version.h
 	-del /f ..\git_version.h