From: Brendan Cully <brendan@kublai.com>
Date: Thu, 15 Sep 2005 23:18:48 +0000 (+0000)
Subject: Move changelog target to update-changelog so that dist won't automatically
X-Git-Tag: mutt-1-5-12-rel~405
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b3ffaa90296360125cde750d8e9aec9cbddb0df4;p=mutt

Move changelog target to update-changelog so that dist won't automatically
invoke it, and have commit and build-release call it.
---

diff --git a/Makefile.am b/Makefile.am
index c3ffaa2a..26d39a2e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -167,15 +167,15 @@ commit-real:
 commit-changelog:
 	(cd $(top_srcdir) && cvs commit -m "# changelog commit" ChangeLog)
 
-commit: pclean check-security commit-real changelog commit-changelog
+commit: pclean check-security commit-real update-changelog commit-changelog
 
-changelog:
+update-changelog:
 	(cd $(top_srcdir); \
 	cvs update ChangeLog; \
 	sh ./mkchangelog.sh | fmt -c | cat  - ChangeLog > ChangeLog.$$$$ && mv ChangeLog.$$$$ ChangeLog; \
 	$${VISUAL:-vi} ChangeLog)
 
-ChangeLog: changelog
+#ChangeLog: changelog
 
 # kluge around automake problems.
 
diff --git a/build-release b/build-release
index 65fe2166..75a6262e 100755
--- a/build-release
+++ b/build-release
@@ -46,7 +46,7 @@ TAG="mutt-`echo $VERSION | tr . -`-rel"
 
 echo 'const char *ReleaseDate = "'`date +%Y-%m-%d`'";' > reldate.h
 
-make changelog 
+make update-changelog 
 
 # now, prepare the distribution tar balls
 
@@ -56,7 +56,7 @@ touch configure.in
 make config.status
 ./config.status
 make update-doc
-make changelog
+make update-changelog
 
 # build them