Added NEWSFILE variable, for name of file generated by

mergechangelogs. Set default to NEWS, to make name expected by
some packaging systems and distros. Also refined rule for
excluding makefiles for zips, such that files named Makefile or
Makefile.* are excluded, while a filed named Makefile-* won't be.
Did that specifically so that the Makefile-example.txt file in
Website would not be excluded from the release package.

diff --git a/cvstools/Release-targets.mk b/cvstools/Release-targets.mk
index 65dd0387f5488bd65f0bcc561a32d755ccf340bb..a9df3a164a39f4e9e0f8cec96adefbe03e045804 100644 (file)
--- a/cvstools/Release-targets.mk
+++ b/cvstools/Release-targets.mk
@@ -13,9 +13,9 @@ RELEASE-NOTES.txt: RELEASE-NOTES.html
 distrib: all $(DISTRIB_DEPENDS)
        $(CVS2LOG) -w
 ifeq ($(DIFFVER),)
-       $(MERGELOGS) > WhatsNew
+       $(MERGELOGS) > $(NEWSFILE)
 else
-       $(MERGELOGS) -v $(DIFFVER) > WhatsNew
+       $(MERGELOGS) -v $(DIFFVER) > $(NEWSFILE)
 endif
 
 newversion:

diff --git a/cvstools/Release-vars.mk b/cvstools/Release-vars.mk
index 76e7d54844381ac255c188a4e49b67015d898a28..49c0f5ec1e46b2199b18bd0c1dee9c3b78a19f5a 100644 (file)
--- a/cvstools/Release-vars.mk
+++ b/cvstools/Release-vars.mk
@@ -15,6 +15,9 @@ DOC-LINK-STYLE=$(DOCBOOK_CVS)/xsl/docsrc/doc-link-docbook.xsl
 BROWSER=w3m
 BROWSER_OPTS=-dump
 
+# file containing "What's New" info generated from CVS log
+NEWSFILE=NEWS
+
 # determine RELVER automatically by:
 #
 #   - figuring out if VERSION file exists
@@ -75,9 +78,10 @@ ZIP_EXCLUDES = \
  \.\\\#.* \
  prj\.el \
  \.cvsignore \
- Makefile \
+ Makefile$$ \
+ Makefile[.] \
  README\.CVS
- 
+
 # specifies options to feed to "freshmeat-submit"
 FMGO=-N
 # SFRELID specifies Sourceforge release ID for current release.