INN commit: trunk (Makefile support/mkmanifest)

INN Commit Russ_Allbery at isc.org
Sun Mar 1 18:20:59 UTC 2009


    Date: Sunday, March 1, 2009 @ 10:20:59
  Author: iulius
Revision: 8368

Generate a changelog file for beta and RC releases.

Exclude README.* files from being checked for in the MANIFEST.

Modified:
  trunk/Makefile
  trunk/support/mkmanifest

--------------------+
 Makefile           |    6 ++----
 support/mkmanifest |    1 +
 2 files changed, 3 insertions(+), 4 deletions(-)

Modified: Makefile
===================================================================
--- Makefile	2009-03-01 09:39:24 UTC (rev 8367)
+++ Makefile	2009-03-01 18:20:59 UTC (rev 8368)
@@ -204,10 +204,10 @@
 	    sed 's/= prerelease/= $(RELEASENUMBER) version/' \
 	        Makefile.global.in > $(TARDIR)/Makefile.global.in ; \
 	else \
-	    cp ChangeLog $(TARDIR)/ ; \
 	    sed 's/= prerelease/=/' Makefile.global.in \
 	        > $(TARDIR)/Makefile.global.in ; \
 	fi
+	cp ChangeLog $(TARDIR)/
 	find $(TARDIR) -type f -print | xargs touch -t `date +%m%d%H%M.%S`
 	tar cf $(TARFILE) $(TARDIR)
 	$(GZIP) -9 $(TARFILE)
@@ -216,9 +216,7 @@
 ##  run by a maintainer since it depends on svn log working and also
 ##  requires svn2cl be available somewhere.
 ChangeLog:
-	if [ "x$(RELEASENUMBER)" = "x" ] ; then \
-	    $(PERL) support/mkchangelog ; \
-	fi
+	$(PERL) support/mkchangelog
 
 
 ##  Check the MANIFEST against the files present in the current tree,

Modified: support/mkmanifest
===================================================================
--- support/mkmanifest	2009-03-01 09:39:24 UTC (rev 8367)
+++ support/mkmanifest	2009-03-01 18:20:59 UTC (rev 8368)
@@ -71,6 +71,7 @@
 ChangeLog
 LIST.*
 Makefile.global
+README.*
 autom4te.cache
 config.cache
 config.log




More information about the inn-committers mailing list