diff options
| author | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2009-01-27 15:49:41 -0200 |
|---|---|---|
| committer | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2009-01-27 15:49:41 -0200 |
| commit | 346743f346bf0eec479d2379c3782f548f3145a3 (patch) | |
| tree | 187abc60a16844972f68c78ecac11bbe17f60208 | |
| parent | a89eba12b88853d7b52b65207da3211d0ace10a9 (diff) | |
Correct make distcheck and add new .gitignore file.
| -rw-r--r-- | .gitignore | 13 | ||||
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 4 |
3 files changed, 18 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..9031468 --- /dev/null +++ b/.gitignore @@ -0,0 +1,13 @@ +*~ +ChangeLog +Makefile +Makefile.in +aclocal.m4 +autom4te.cache +config.log +config.status +configure +install-sh +missing +tags +xorg-sgml-doctools-*.tar.* diff --git a/Makefile.am b/Makefile.am index 05be76b..5650b2a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -29,6 +29,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 426d4a4..a9c4406 100644 --- a/configure.ac +++ b/configure.ac @@ -25,9 +25,13 @@ AC_INIT(xorg-sgml-doctools,[1.2], [https://bugs.freedesktop.org/enter_bug.cgi?pr AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE +# Require xorg-macros: XORG_CWARNFLAGS, 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_INSTALL XORG_RELEASE_VERSION +XORG_CHANGELOG AC_OUTPUT([ Makefile |