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 | 5fc284976292e3d67e8fe68c711dab1ae224da17 (patch) | |
| tree | cda994f6d84ec013af29225c81aab6f704486d73 | |
| parent | 15d4322f7f9d8cea77c59c8a01ed9cc4c8a72390 (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 | 24 |
3 files changed, 17 insertions, 14 deletions
@@ -8,3 +8,6 @@ configure install-sh missing *~ +font-misc-ethiopic-*.tar.* +ChangeLog +tags diff --git a/Makefile.am b/Makefile.am index 249b03e..d0e24cb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -25,7 +25,7 @@ ttffont_DATA = GohaTibebZemen.ttf otffontdir = @OTFFONTDIR@ otffont_DATA = GohaTibebZemen.otf -EXTRA_DIST = $(ttffont_DATA) $(otffont_DATA) license.txt autogen.sh +EXTRA_DIST = $(ttffont_DATA) $(otffont_DATA) license.txt install-data-hook: @rm -f $(DESTDIR)$(ttffontdir)/fonts.scale @@ -48,6 +48,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 948fd62..ba4c5c1 100644 --- a/configure.ac +++ b/configure.ac @@ -26,6 +26,9 @@ AC_INIT(font-misc-ethiopic, [1.0.0], [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 AC_PATH_PROG(MKFONTSCALE, mkfontscale) @@ -38,22 +41,19 @@ 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_TTFFONTDIR=${libdir}/X11/fonts/TTF -AC_ARG_WITH(ttf-fontdir, - AS_HELP_STRING([--with-ttf-fontdir=FONTDIR], [Path to install TTF fonts]), - [TTFFONTDIR="$withval"], - [TTFFONTDIR="$DEFAULT_TTFFONTDIR"]) +ttffontdir=${libdir}/X11/fonts/TTF +AC_ARG_WITH(ttf-fontdir, AC_HELP_STRING([--with-ttf-fontdir=<pathname>], + [Path to install TTF fonts]), [ttffontdir="$withval"]) +TTFFONTDIR="$ttffontdir" AC_SUBST(TTFFONTDIR) -DEFAULT_OTFFONTDIR=${libdir}/X11/fonts/OTF -AC_ARG_WITH(otf-fontdir, - AS_HELP_STRING([--with-otf-fontdir=FONTDIR], [Path to install OTF fonts]), - [OTFFONTDIR="$withval"], - [OTFFONTDIR="$DEFAULT_OTFFONTDIR"]) +otffontdir=${libdir}/X11/fonts/OTF +AC_ARG_WITH(otf-fontdir, AC_HELP_STRING([--with-otf-fontdir=<pathname>], + [Path to install OTF fonts]), [otffontdir="$withval"]) +OTFFONTDIR="$otffontdir" AC_SUBST(OTFFONTDIR) XORG_RELEASE_VERSION +XORG_CHANGELOG AC_OUTPUT([Makefile]) |