diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2016-02-19 12:37:59 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2016-02-19 12:37:59 +0000 |
| commit | 3df99bcbe3e80467f050484d83eca9ffae03e947 (patch) | |
| tree | f7e61f5851e82ad7f55342a0ce87d0fbd9a288bd | |
| parent | 55d8f3fc9cdfe5b8f00c546a7264b195fb655148 (diff) | |
| download | dbus-python-3df99bcbe3e80467f050484d83eca9ffae03e947.tar.gz | |
Use AX_GENERATE_CHANGELOG to generate ChangeLog
Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
| -rw-r--r-- | Makefile.am | 12 | ||||
| -rw-r--r-- | configure.ac | 2 |
2 files changed, 5 insertions, 9 deletions
diff --git a/Makefile.am b/Makefile.am index e9cb1e0..309cd5a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -346,16 +346,10 @@ $(patsubst %,%.test,$(test_programs)): %.test: Makefile # === Documentation === -dist-hook: +@GENERATE_CHANGELOG_RULES@ + +dist-hook: dist-ChangeLog echo $(VERSION) > $(distdir)/.version - chmod u+w $(distdir)/ChangeLog - if test -d $(top_srcdir)/.git; then \ - if GIT_DIR=$(top_srcdir)/.git git log --stat > $(distdir)/ChangeLog; then \ - : ; \ - else \ - GIT_DIR=$(top_srcdir)/.git git log > $(distdir)/ChangeLog; \ - fi; \ - fi touch $(distdir)/MANIFEST touch $(distdir)/MANIFEST.in ( cd $(distdir) && find -type d -o -print ) | \ diff --git a/configure.ac b/configure.ac index ae7a7d0..3cadc65 100644 --- a/configure.ac +++ b/configure.ac @@ -96,6 +96,8 @@ AM_CONDITIONAL([ENABLE_INSTALLED_TESTS], [test "_$enable_installed_tests" = _yes dnl Building documentation +AX_GENERATE_CHANGELOG + AC_MSG_CHECKING([whether you want to build HTML docs]) AC_ARG_ENABLE(html-docs, AC_HELP_STRING([--enable-html-docs], [Enable HTML documentation building (requires docutils, default: auto-detect)]), enable_html_docs=$enableval, enable_html_docs="if possible") |