Merge branch 'master' into justus/pyme3
[gpgme.git] / Makefile.am
index 1ab445d..cb22a91 100644 (file)
 ## Process this file with automake to produce Makefile.in
 
 ACLOCAL_AMFLAGS = -I m4
-AUTOMAKE_OPTIONS = dist-bzip2
 
-DISTCHECK_CONFIGURE_FLAGS = --with-gpg="@GPG@"
+DISTCHECK_CONFIGURE_FLAGS =
 
-EXTRA_DIST = gpgme.spec.in autogen.sh                                  \
+EXTRA_DIST = autogen.sh autogen.rc gpgme.spec.in                       \
              ChangeLog-2011 m4/ChangeLog-2011 contrib/ChangeLog-2011
 
 
@@ -50,7 +49,7 @@ gen_start_date = 2011-12-01T00:00:00
 gen-ChangeLog:
        if test -d $(top_srcdir)/.git; then                             \
          (cd $(top_srcdir) &&                                          \
-           ./build-aux/gitlog-to-changelog                             \
+           $(GITLOG_TO_CHANGELOG) --append-dot --tear-off              \
            --amend=build-aux/git-log-fix                               \
            --since=$(gen_start_date) ) > $(distdir)/cl-t;              \
           cat $(top_srcdir)/build-aux/git-log-footer >> $(distdir)/cl-t;\