diff options
| author | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-10-07 18:02:10 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-10-07 18:45:29 -0700 |
| commit | 7d19d6a4ec173a6f7f9743ad4bc629a5d306eef2 (patch) | |
| tree | 566184e9c21ec14a5075982e2cb5ee8a8fd4e559 | |
| parent | c82bfd47978d78008f8358bcc2f56a04367bdceb (diff) | |
Migrate to xorg macros 1.3 & font-util 1.1 macros
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
| -rw-r--r-- | Makefile.am | 24 | ||||
| -rw-r--r-- | configure.ac | 39 |
2 files changed, 17 insertions, 46 deletions
diff --git a/Makefile.am b/Makefile.am index c979e70..80bcd0e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -25,6 +25,9 @@ ttffont_DATA = GohaTibebZemen.ttf otffontdir = @OTFFONTDIR@ otffont_DATA = GohaTibebZemen.otf +# Used by RUN_FCCACHE +fontdir = $(ttffontdir) $(otffontdir) + EXTRA_DIST = $(ttffont_DATA) $(otffont_DATA) license.txt install-data-hook: @@ -32,30 +35,11 @@ install-data-hook: $(MKFONTSCALE) $(DESTDIR)$(ttffontdir) @rm -f $(DESTDIR)$(ttffontdir)/font.dir $(MKFONTDIR) $(DESTDIR)$(ttffontdir) - @(if `test -z '$(DESTDIR)'`; then \ - echo $(FCCACHE) $(ttffontdir); \ - $(FCCACHE) $(ttffontdir); \ - else \ - echo "***"; \ - echo "*** Warning: fonts.cache not built"; \ - echo "***"; \ - echo "*** Generate this file manually on host system using fc-cache"; \ - echo "***"; \ - fi) @rm -f $(DESTDIR)$(otffontdir)/fonts.scale $(MKFONTSCALE) $(DESTDIR)$(otffontdir) @rm -f $(DESTDIR)$(otffontdir)/font.dir $(MKFONTDIR) $(DESTDIR)$(otffontdir) - @(if `test -z '$(DESTDIR)'`; then \ - echo $(FCCACHE) $(otffontdir); \ - $(FCCACHE) $(otffontdir); \ - else \ - echo "***"; \ - echo "*** Warning: fonts.cache not built"; \ - echo "***"; \ - echo "*** Generate this file manually on host system using fc-cache"; \ - echo "***"; \ - fi) + @RUN_FCCACHE@ distuninstallcheck: @: diff --git a/configure.ac b/configure.ac index ba4c5c1..acda529 100644 --- a/configure.ac +++ b/configure.ac @@ -26,34 +26,21 @@ 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) -if test x"$MKFONTSCALE" = x; then - AC_MSG_ERROR([mkfontscale is required to build misc-ethiopic fonts.]) -fi -AC_PATH_PROG(MKFONTDIR, mkfontdir) -if test x"$MKFONTDIR" = x; then - AC_MSG_ERROR([mkfontdir is required to build misc-ethiopic fonts.]) -fi -AC_PATH_PROG(FCCACHE, fc-cache) +# Require xorg-macros: XORG_DEFAULT_OPTIONS +m4_ifndef([XORG_MACROS_VERSION], + [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.3) +XORG_DEFAULT_OPTIONS -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) +AC_PROG_INSTALL -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) +# Require X.Org's font util macros 1.1 or later +m4_ifndef([XORG_FONT_MACROS_VERSION], + [m4_fatal([must install X.Org font-util 1.1 or later before running autoconf/autogen])]) +XORG_FONT_MACROS_VERSION(1.1) -XORG_RELEASE_VERSION -XORG_CHANGELOG +XORG_FONTSUBDIR([TTFFONTDIR], [ttf-fontdir], [TTF]) +XORG_FONTSUBDIR([OTFFONTDIR], [otf-fontdir], [OTF]) +XORG_FONT_SCALED_UTILS AC_OUTPUT([Makefile]) |