[SCM] GNU Mailutils branch, master, updated. mu-1-2-90-separate-argp-cfg-249-gc5a62c6

[Sergey Poznyakoff]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Mailutils".

http://git.savannah.gnu.org/cgit/mailutils.git/commit/?id=c5a62c646c7d60187273ff826aec37d774b391e8

The branch, master has been updated
       via  c5a62c646c7d60187273ff826aec37d774b391e8 (commit)
      from  8b0317ffca0594d8769f277062a0b7eb55687add (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit c5a62c646c7d60187273ff826aec37d774b391e8
Author: Sergey Poznyakoff <address@hidden>
Date:   Wed Mar 25 11:20:40 2009 +0200

    Remove vestiges of scripts/ in Makefiles

-----------------------------------------------------------------------

Summary of changes:
 Makefile.am             |   51 ++++++++++++++++++++++------------------------
 doc/texinfo/Makefile.am |    4 +-
 2 files changed, 26 insertions(+), 29 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index d22df6d..7a6dc2e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -59,35 +59,32 @@ SUBDIRS = \
 
 EXTRA_DIST = COPYING.LESSER
 
-.PHONY: make-ChangeLog
-make-ChangeLog: 
-       if test -d .git; then                                           \
-         $(top_srcdir)/scripts/gitlog-to-changelog |                   \
-            sed '/<unknown>$$/d' | fmt -s > $(distdir)/cl-t;            \
-         echo "" >> $(distdir)/cl-t;                                 \
-         echo "Local Variables:" >> $(distdir)/cl-t;                   \
-         echo "mode: change-log" >> $(distdir)/cl-t;                   \
-         echo "version-control: never"  >> $(distdir)/cl-t;            \
-         echo "buffer-read-only: t" >> $(distdir)/cl-t;                \
-         echo "End:" >> $(distdir)/cl-t;                               \
-         rm -f $(distdir)/ChangeLog;                                   \
-         mv $(distdir)/cl-t $(distdir)/ChangeLog;                      \
-       fi
-
-dist-hook: make-ChangeLog
+gen_start_date = 
+prev_change_log = 
 
 .PHONY: ChangeLog
-ChangeLog: 
-       if test -d .git; then                                           \
-         $(top_srcdir)/scripts/gitlog-to-changelog |                   \
-            sed '/<unknown>$$/d' | fmt -s > ChangeLog;                  \
-         echo "" >> ChangeLog;                                       \
-         echo "Local Variables:" >> ChangeLog;                         \
-         echo "mode: change-log" >> ChangeLog;                         \
-         echo "version-control: never"  >> ChangeLog;                  \
-         echo "buffer-read-only: t" >> ChangeLog;                      \
-         echo "End:" >> ChangeLog;                                     \
-        fi
+ChangeLog:
+       @if test -d .git; then                                             \
+         cmd=$(top_srcdir)/build-aux/gitlog-to-changelog;                 \
+         if test -n "$(gen_start_date)"; then                             \
+           cmd="$$cmd --since=\"$(gen_start_date)\"";                     \
+         fi;                                                              \
+         $$cmd |                                                          \
+            sed '/<unknown>$$/d' | fmt -s > cl-t;                          \
+          if test -n "$(prev_change_log)" && test -f "$(prev_change_log)"; \
+         then                                                             \
+           echo "" >> cl-t;                                               \
+           cat "$(prev_change_log)" |                                     \
+             sed '/^Local Variables:/,/^End:/d' >> cl-t;                  \
+         fi;                                                              \
+         echo "Local Variables:" >> cl-t;                                 \
+         echo "mode: change-log" >> cl-t;                                 \
+         echo "version-control: never"  >> cl-t;                          \
+         echo "buffer-read-only: t" >> cl-t;                              \
+         echo "End:" >> cl-t;                                             \
+         rm -f ChangeLog;                                                 \
+         mv cl-t ChangeLog;                                               \
+       fi
 
 alpha:
        $(MAKE) dist distdir=$(PACKAGE)-$(VERSION)-`date +"%Y%m%d"`
diff --git a/doc/texinfo/Makefile.am b/doc/texinfo/Makefile.am
index b647205..2695b98 100644
--- a/doc/texinfo/Makefile.am
+++ b/doc/texinfo/Makefile.am
@@ -100,10 +100,10 @@ TEXI2DVI=texi2dvi -t '@set $(RENDITION)' -E
 # Make sure you set TEXINPUTS.
 # TEXINPUTS=/usr/share/texmf/pdftex/plain/misc/ is ok for most distributions
 
-TEXINPUTS=$(srcdir):$(top_srcdir)/scripts:$$TEXINPUTS
+TEXINPUTS=$(srcdir):$(top_srcdir)/build-aux:$$TEXINPUTS
 
 manual:
-        TEXINPUTS=$(srcdir):$(top_srcdir)/scripts:$(TEXINPUTS) \
+        TEXINPUTS=$(srcdir):$(top_srcdir)/build-aux:$(TEXINPUTS) \
         MAKEINFO="$(MAKEINFO) $(MAKEINFOFLAGS)" \
         TEXI2DVI="$(TEXI2DVI) -t @finalout" \
        $(GENDOCS) $(PACKAGE) '$(PACKAGE_NAME) manual'


hooks/post-receive
--
GNU Mailutils