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 c3ffaa2ac9341291e0b9a27ec7a2cb5481ce32bf..26d39a2e2818cc813d30c221bb13427824d0c3bb 100644 (file)
--- 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 65fe2166266cf3cdbbc25bf68ff805a74f1003ee..75a6262eb8eeef82478f48140c3540b89b73ba1b 100755 (executable)
--- 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