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 | d3ba51fda868ec7906b91946f2ae7ae380d307a9 (patch) | |
tree | 7a956ee98f5b6e2942ad15d90f83240930710be5 | |
parent | cc5aaaeeab3712d69a76f7ff4fac07573b980f33 (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-bh-100dpi-*.tar.* +ChangeLog +tags diff --git a/Makefile.am b/Makefile.am index e86f03f..9e9dbcd 100644 --- a/Makefile.am +++ b/Makefile.am @@ -203,7 +203,7 @@ BUILT_BDF_FILES = \ $(ISO8859_15_BDF_FILES) CLEANFILES = $(font_DATA) $(BUILT_BDF_FILES) -EXTRA_DIST = $(BDF_FILES) LU_LEGALNOTICE autogen.sh +EXTRA_DIST = $(BDF_FILES) LU_LEGALNOTICE all-local: $(BUILT_BDF_FILES) $(font_DATA) @@ -222,6 +222,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 c4b95ac..182679c 100644 --- a/configure.ac +++ b/configure.ac @@ -26,6 +26,9 @@ AC_INIT(font-bh-100dpi, [1.0.0], [https://bugs.freedesktop.org/enter_bug.cgi?pro 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 bh-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]) |