diff options
| author | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2009-01-27 19:11:08 -0200 |
|---|---|---|
| committer | Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> | 2009-01-27 19:11:08 -0200 |
| commit | fb5ea1122156a710a84b71e885e14cdebaf6ac90 (patch) | |
| tree | 23a0b955735af0bfa867607d598eab7226956572 | |
| parent | c10d7d62778e1259e4ed76304a59814b813ba00c (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 | 19 |
3 files changed, 15 insertions, 11 deletions
@@ -8,3 +8,6 @@ configure install-sh missing *~ +font-xfree86-type1-*.tar.* +ChangeLog +tags diff --git a/Makefile.am b/Makefile.am index c1e5f59..2e65a04 100644 --- a/Makefile.am +++ b/Makefile.am @@ -25,7 +25,7 @@ FONT_FILES = \ fontdir = @FONTDIR@ font_DATA = $(FONT_FILES) -EXTRA_DIST = $(FONT_FILES) autogen.sh +EXTRA_DIST = $(FONT_FILES) install-data-hook: @rm -f $(DESTDIR)$(fontdir)/fonts.scale @@ -43,6 +43,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 a458de1..c5852a5 100644 --- a/configure.ac +++ b/configure.ac @@ -26,17 +26,11 @@ AC_INIT(font-xfree86-type1, [1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi 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_FONTDIR=${libdir}/X11/fonts/Type1 -AC_ARG_WITH(fontdir, - AS_HELP_STRING([--with-fontdir=FONTDIR], [Path to install fonts]), - [FONTDIR="$withval"], - [FONTDIR="$DEFAULT_FONTDIR"]) -AC_SUBST(FONTDIR) - AC_PATH_PROG(MKFONTSCALE, mkfontscale) if test x"$MKFONTSCALE" = x; then AC_MSG_ERROR([mkfontscale is required to build xfree86-type1 fonts.]) @@ -47,6 +41,13 @@ if test x"$MKFONTDIR" = x; then fi AC_PATH_PROG(FCCACHE, fc-cache) +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]) |