diff options
| author | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2009-01-27 19:11:06 -0200 |
|---|---|---|
| committer | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2009-01-27 19:11:06 -0200 |
| commit | 6912df83bc761a6ecd902d03883bffd536a41416 (patch) | |
| tree | fdf80e4a2a2a4645807406245c24ce3e4554b832 | |
| parent | e3321d06ca1772a79a9ea947711fbabaa6b690ab (diff) | |
Janitor: Correct make distcheck and configure.ac simplification
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | Makefile.am | 6 | ||||
| -rw-r--r-- | configure.ac | 15 |
3 files changed, 13 insertions, 11 deletions
@@ -8,3 +8,6 @@ configure install-sh missing *~ +font-alias-*.tar.* +ChangeLog +tags diff --git a/Makefile.am b/Makefile.am index 4777640..8afe522 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,14 +21,12 @@ SUBDIRS = 100dpi 75dpi cyrillic misc -EXTRA_DIST = autogen.sh - -EXTRA_DIST += ChangeLog +EXTRA_DIST = ChangeLog 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 35c3fee..f4e56d0 100644 --- a/configure.ac +++ b/configure.ac @@ -26,18 +26,19 @@ AC_INIT(font-alias, [1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE +# 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_INSTALL -m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))]) - -DEFAULT_TOPFONTDIR=${libdir}/X11/fonts -AC_ARG_WITH(top-fontdir, - AS_HELP_STRING([--with-top-fontdir=<path>], [Path to top level font directory]), - [TOPFONTDIR="$withval"], - [TOPFONTDIR="$DEFAULT_TOPFONTDIR"]) +topfontdir=${libdir}/X11/fonts +AC_ARG_WITH(top-fontdir, AC_HELP_STRING([--with-top-fontdir=<pathname>], + [Path to toplevel font directory]), [topfontdir="$withval"]) +TOPFONTDIR="$topfontdir" AC_SUBST(TOPFONTDIR) XORG_RELEASE_VERSION +XORG_CHANGELOG AC_OUTPUT([Makefile 100dpi/Makefile |