Merge branch 'maint'

* maint:
  Update .gitignore
  doc: Add 0MQ version to XHTML11 backend footer
  build: Generate ChangeLog in 'make dist', ZIP automatically

.gitignore

@@ -43,3 +43,5 @@ builds/msvc/*/Release
 foreign/openpgm/*
 !foreign/openpgm/*.tar.bz2
 !foreign/openpgm/*.tar.gz
+zeromq-*.tar.gz
+zeromq-*.zip

Makefile.am

@@ -9,9 +9,21 @@ $(top_srcdir)/foreign/xmlParser/xmlParser.cpp \
 $(top_srcdir)/foreign/xmlParser/xmlParser.hpp
 
 dist-hook:
-		-cp $(top_srcdir)/builds/redhat/zeromq.spec $(distdir)/zeromq.spec
-		-sed s/\@PACKAGE_VERSION\@/@PACKAGE_VERSION@/ -i $(distdir)/zeromq.spec
-		-rm -rf $(distdir)/foreign/openpgm/@pgm_basename@
+	@if test -d "$(srcdir)/.git"; \
+	then \
+		echo Creating ChangeLog && \
+		( cd "$(top_srcdir)" && \
+		  echo '# Generated by Makefile. Do not edit.'; echo; \
+		  $(top_srcdir)/config/missing --run git log --stat ) > ChangeLog.tmp \
+		  && mv -f ChangeLog.tmp $(top_distdir)/ChangeLog \
+		  || ( rm -f ChangeLog.tmp ; \
+		       echo Failed to generate ChangeLog >&2 ); \
+	else \
+		echo A git clone is required to generate a ChangeLog >&2; \
+	fi
+	-cp $(top_srcdir)/builds/redhat/zeromq.spec $(distdir)/zeromq.spec
+	-sed s/\@PACKAGE_VERSION\@/@PACKAGE_VERSION@/ -i $(distdir)/zeromq.spec
+	-rm -rf $(distdir)/foreign/openpgm/@pgm_basename@
 distclean-local:
-		-rm -rf $(top_srcdir)/foreign/openpgm/@pgm_basename@
+	-rm -rf $(top_srcdir)/foreign/openpgm/@pgm_basename@
 

configure.in

@@ -11,7 +11,7 @@ AC_INIT([zeromq],[2.1.0],[zeromq-dev@lists.zeromq.org])
 AC_CONFIG_AUX_DIR(config)
 AC_CONFIG_MACRO_DIR(config)
 AM_CONFIG_HEADER(src/platform.hpp)
-AM_INIT_AUTOMAKE(tar-ustar)
+AM_INIT_AUTOMAKE(tar-ustar dist-zip foreign)
 
 # This defines PACKAGE_VERSION_... in src/platform.hpp
 PV_MAJOR=`echo $PACKAGE_VERSION | cut -d . -f 1`

doc/asciidoc.conf

@@ -36,6 +36,20 @@ template::[header-declarations]
 endif::backend-docbook[]
 endif::doctype-manpage[]
 
+ifdef::backend-xhtml11[]
+[footer]
+</div>
+{disable-javascript%<div id="footnotes"><hr /></div>}
+<div id="footer">
+<div id="footer-text">
+ØMQ {zmq_version}<br />
+Last updated {docdate} {doctime}
+</div>
+</div>
+</body>
+</html>
+endif::backend-xhtml11[]
+
 [replacements]
 ifdef::backend-xhtml11[]
 0MQ=ØMQ