Update manuals from master
[gnupg.git] / Makefile.am
index 900cc9f..05917a0 100644 (file)
@@ -24,13 +24,22 @@ ACLOCAL_AMFLAGS = -I m4
 DISTCHECK_CONFIGURE_FLAGS = --enable-mailto
 AUTOMAKE_OPTIONS = dist-bzip2 filename-length-max=99
 
+GITLOG_TO_CHANGELOG=gitlog-to-changelog
+
 if CROSS_COMPILING
 checks =
 else
 checks = checks
 endif
 
-SUBDIRS = m4 intl zlib util mpi cipher tools g10 keyserver po doc ${checks}
+if HAVE_W32_SYSTEM
+bzlib = bzlib
+else
+bzlib =
+endif
+
+SUBDIRS = m4 intl zlib ${bzlib} util mpi cipher tools \
+          g10 keyserver po doc ${checks}
 
 EXTRA_DIST = scripts/config.rpath PROJECTS BUGS config.h.in    \
              autogen.sh ChangeLog-2011 po/ChangeLog-2011       \
@@ -73,10 +82,10 @@ dist-hook: gen-ChangeLog
 gen_start_date = 2011-12-01T06:00:00
 .PHONY: gen-ChangeLog
 gen-ChangeLog:
+       set -e;                                                         \
        if test -d $(top_srcdir)/.git; then                             \
          (cd $(top_srcdir) &&                                          \
-           ./scripts/gitlog-to-changelog                               \
-           --append-dot --tear-off                                     \
+           $(GITLOG_TO_CHANGELOG) --append-dot --tear-off              \
            --amend=scripts/git-log-fix                                 \
            --since=$(gen_start_date) ) > $(distdir)/cl-t;              \
           cat $(top_srcdir)/scripts/git-log-footer >> $(distdir)/cl-t;  \