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 | 7da9a27ef660b9eb056e57838d84e52c5df7792b (patch) | |
| tree | c02f99617d0ad0c2ac100f588ee20bb289373c5a | |
| parent | babbadea2713e036ecb569c7b5a5dd65acbcdfe4 (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
@@ -10,3 +10,6 @@ configure install-sh missing *~ +font-adobe-utopia-100dpi-*.tar.* +ChangeLog +tags diff --git a/Makefile.am b/Makefile.am index 38b47d8..12c3a05 100644 --- a/Makefile.am +++ b/Makefile.am @@ -167,7 +167,7 @@ BUILT_BDF_FILES = \ $(ISO8859_15_BDF_FILES) CLEANFILES = $(font_DATA) $(BUILT_BDF_FILES) -EXTRA_DIST = $(BDF_FILES) autogen.sh +EXTRA_DIST = $(BDF_FILES) all-local: $(BUILT_BDF_FILES) $(font_DATA) @@ -186,6 +186,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 94af2b8..4977948 100644 --- a/configure.ac +++ b/configure.ac @@ -26,6 +26,9 @@ AC_INIT(font-adobe-utopia-100dpi, [1.0.1], [https://bugs.freedesktop.org/enter_b 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(BDFTOPCF, bdftopcf) @@ -39,13 +42,10 @@ if test x"$MKFONTDIR" = x; then AC_MSG_ERROR([mkfontdir is required to build adobe-utopia-100dpi fonts.]) fi -m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))]) - -DEFAULT_FONTDIR=${libdir}/X11/fonts/100dpi -AC_ARG_WITH(fontdir, - AS_HELP_STRING([--with-fontdir=FONTDIR], [Path to install fonts]), - [FONTDIR="$withval"], - [FONTDIR="$DEFAULT_FONTDIR"]) +fontdir=${libdir}/X11/fonts/100dpi +AC_ARG_WITH(fontdir, AC_HELP_STRING([--with-fontdir=<pathname>], + [Path to install fonts]), [fontdir="$withval"]) +FONTDIR="$fontdir" AC_SUBST(FONTDIR) PKG_CHECK_MODULES(MAPS, [fontutil]) @@ -63,5 +63,6 @@ XORG_FONT_CHECK_ISO8859_14 XORG_FONT_CHECK_ISO8859_15 XORG_RELEASE_VERSION +XORG_CHANGELOG AC_OUTPUT([Makefile]) |