diff options
| author | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2009-01-19 15:35:18 -0200 |
|---|---|---|
| committer | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2009-01-19 15:35:18 -0200 |
| commit | 1a5970637c4cc4e9e4278a6a991ae0c79f61de41 (patch) | |
| tree | e6fdf30208493b854cc32c8008986d9318da647a | |
| parent | f6779d9ddc53b51b5376be51c0cc1093938fea32 (diff) | |
Correct make distcheck for the git-log to git log change.
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 11 |
3 files changed, 7 insertions, 8 deletions
@@ -18,3 +18,5 @@ stamp-h1 xauth_switch_to_sun-des-1 xon.1 *~ +scripts-*.tar.* +tags diff --git a/Makefile.am b/Makefile.am index a94325f..719bffe 100644 --- a/Makefile.am +++ b/Makefile.am @@ -71,6 +71,6 @@ MAINTAINERCLEANFILES = ChangeLog .PHONY: ChangeLog ChangeLog: - (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2) + $(CHANGELOG_CMD) dist-hook: ChangeLog diff --git a/configure.ac b/configure.ac index 1cbc63a..cadd6e7 100644 --- a/configure.ac +++ b/configure.ac @@ -26,17 +26,14 @@ AC_INIT(scripts,[1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xor AM_INIT_AUTOMAKE([dist-bzip2]) AM_MAINTAINER_MODE -AM_CONFIG_HEADER(config.h) +# Require xorg-macros: XORG_CHANGELOG +m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.2) -AC_PROG_CC AC_PROG_INSTALL -# Checks for pkg-config packages -PKG_CHECK_MODULES(SCRIPTS, x11) -AC_SUBST(SCRIPTS_CFLAGS) -AC_SUBST(SCRIPTS_LIBS) - XORG_MANPAGE_SECTIONS XORG_RELEASE_VERSION +XORG_CHANGELOG AC_OUTPUT([Makefile]) |