From 6aac7faa8468a5bff142fd3059aaf46b2fb018d1 Mon Sep 17 00:00:00 2001
From: Michael Smith <xmldoc@users.sourceforge.net>
Date: Fri, 8 Apr 2005 13:37:28 +0000
Subject: [PATCH] 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.

---
 cvstools/Release-targets.mk | 4 ++--
 cvstools/Release-vars.mk    | 8 ++++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/cvstools/Release-targets.mk b/cvstools/Release-targets.mk
index 65dd0387f..a9df3a164 100644
--- 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 76e7d5484..49c0f5ec1 100644
--- 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.
-- 
2.40.0