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 | e6fae6dcf9f95cdb53bc7eaa51d56d543d6d5f1e (patch) | |
| tree | 7651e26112bc3f023f37c3e4870e1e10920d738c | |
| parent | ee17d9b930247724f9847ad9f17739f09e103bb0 (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
@@ -9,3 +9,6 @@ install-sh micro.pcf.gz missing *~ +font-micro-misc-*.tar.* +ChangeLog +tags diff --git a/Makefile.am b/Makefile.am index f1a4de6..8616db6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -35,7 +35,7 @@ fontdir = @FONTDIR@ font_DATA = $(PCF_FILES) CLEANFILES = $(font_DATA) -EXTRA_DIST = $(BDF_FILES) autogen.sh +EXTRA_DIST = $(BDF_FILES) install-data-hook: @rm -f $(DESTDIR)$(fontdir)/fonts.scale @@ -52,6 +52,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 d3fcbf3..3a30819 100644 --- a/configure.ac +++ b/configure.ac @@ -26,6 +26,9 @@ AC_INIT(font-micro-misc, [1.0.0], [https://bugs.freedesktop.org/enter_bug.cgi?pr 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) @@ -38,15 +41,13 @@ if test x"$MKFONTDIR" = x; then AC_MSG_ERROR([mkfontdir is required to build micro-misc fonts.]) fi -m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))]) - -DEFAULT_FONTDIR=${libdir}/X11/fonts/misc -AC_ARG_WITH(fontdir, - AS_HELP_STRING([--with-fontdir=FONTDIR], [Path to install fonts]), - [FONTDIR="$withval"], - [FONTDIR="$DEFAULT_FONTDIR"]) +fontdir=${libdir}/X11/fonts/misc +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]) |