diff options
| author | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2009-01-27 19:11:07 -0200 |
|---|---|---|
| committer | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2009-01-27 19:11:07 -0200 |
| commit | fca975ffcac8a4455c24300396e652e646c8476c (patch) | |
| tree | bb6a8eb449c9ee7f7613a869fc9c3aa48d2035ab | |
| parent | aee9204788007ebb2fbe842108735e36672c9215 (diff) | |
Janitor: Correct make distcheck and configure.ac simplification
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | configure.ac | 15 |
3 files changed, 13 insertions, 9 deletions
@@ -8,3 +8,6 @@ configure install-sh missing *~ +font-bitstream-type1-*.tar.* +ChangeLog +tags diff --git a/Makefile.am b/Makefile.am index acba027..7ff500d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -40,7 +40,7 @@ FONT_FILES = \ fontdir = @FONTDIR@ font_DATA = $(FONT_FILES) -EXTRA_DIST = $(FONT_FILES) Copyright autogen.sh +EXTRA_DIST = $(FONT_FILES) Copyright install-data-hook: @rm -f $(DESTDIR)$(fontdir)/fonts.scale @@ -58,6 +58,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 41e863a..ee6caea 100644 --- a/configure.ac +++ b/configure.ac @@ -26,6 +26,9 @@ AC_INIT(font-bitstream-type1, [1.0.0], [https://bugs.freedesktop.org/enter_bug.c 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 AC_PATH_PROG(MKFONTSCALE, mkfontscale) @@ -38,15 +41,13 @@ if test x"$MKFONTDIR" = x; then fi AC_PATH_PROG(FCCACHE, fc-cache) -m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))]) - -DEFAULT_FONTDIR=${libdir}/X11/fonts/Type1 -AC_ARG_WITH(fontdir, - AS_HELP_STRING([--with-fontdir=FONTDIR], [Path to install fonts]), - [FONTDIR="$withval"], - [FONTDIR="$DEFAULT_FONTDIR"]) +fontdir=${libdir}/X11/fonts/Type1 +AC_ARG_WITH(fontdir, AC_HELP_STRING([--with-fontdir=<pathname>], + [Path to install fonts]), [fontdir="$withval"]) +FONTDIR="$fontdir" AC_SUBST(FONTDIR) XORG_RELEASE_VERSION +XORG_CHANGELOG AC_OUTPUT([Makefile]) |