diff options
| author | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2009-01-27 15:37:07 -0200 |
|---|---|---|
| committer | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2009-01-27 15:37:07 -0200 |
| commit | c734aa47795aa1bdbcbd01872a8b0d1a99cd4dd4 (patch) | |
| tree | 90d4b5a81ce05b1fe1d545785e26dc3c6fd31a79 | |
| parent | 423873fb23e4a12a9745d13d8967956db7e5b28e (diff) | |
Correct make distcheck.
| -rw-r--r-- | .gitignore | 10 | ||||
| -rw-r--r-- | Makefile.am | 7 | ||||
| -rw-r--r-- | configure.ac | 13 |
3 files changed, 23 insertions, 7 deletions
@@ -1,7 +1,17 @@ *~ +ChangeLog +Makefile Makefile.in aclocal.m4 autom4te.cache +config.h +config.h.in +config.log +config.cursor +config.status configure install-sh missing +stamp-h1 +tags +xcursor-themes-*.tar.* diff --git a/Makefile.am b/Makefile.am index c9c3c90..7ef35b1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,3 +1,5 @@ +DISTCHECK_CONFIGURE_FLAGS = --with-cursordir=\$${datadir}/icons + SUBDIRS = handhelds redglass whiteglass EXTRA_DIST = genmakefile.sh ChangeLog @@ -9,7 +11,4 @@ dist-hook: 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) diff --git a/configure.ac b/configure.ac index 7b6bed5..0d9caa6 100644 --- a/configure.ac +++ b/configure.ac @@ -1,10 +1,12 @@ -# $XdotOrg: $ - AC_PREREQ([2.57]) AC_INIT(xcursor-themes, [1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xcursor-themes) AM_INIT_AUTOMAKE([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) + AM_CONFIG_HEADER(config.h) AC_PROG_CC @@ -19,7 +21,11 @@ fi AC_SUBST([XCURSORGEN]) PKG_CHECK_MODULES(ICONDEFS, xcursor) -cursordir=$(pkg-config --variable=icondir xcursor) +pkg_cursordir=$(pkg-config --variable=icondir xcursor) +AC_ARG_WITH(cursordir, + AC_HELP_STRING([--with-cursordir=<pathname>], + [specify directory for cursor files (default is autodetected)]), + [cursordir="$withval"], [cursordir="${pkg_cursordir}"]) AC_SUBST([cursordir]) AM_CONDITIONAL(WHITEGLASS, true) @@ -27,6 +33,7 @@ AM_CONDITIONAL(REDGLASS, true) AM_CONDITIONAL(HANDHELDS, true) XORG_RELEASE_VERSION +XORG_CHANGELOG AC_OUTPUT([ Makefile |