diff options
| author | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-10-07 15:08:31 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@sun.com> | 2009-10-07 15:08:31 -0700 |
| commit | b231452a798b2efdc32c9676b8bb52941c3cf0b2 (patch) | |
| tree | 73ce378a2b61e983849f83a383edcbfc22c130de | |
| parent | aee67b1e107ac16549c6c4db00c3abea195ee18b (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 | 11 | ||||
| -rw-r--r-- | configure.ac | 32 |
2 files changed, 17 insertions, 26 deletions
diff --git a/Makefile.am b/Makefile.am index 2493354..3068771 100644 --- a/Makefile.am +++ b/Makefile.am @@ -50,13 +50,13 @@ FONT_FILES = \ termB14 BDF_FILES = $(FONT_FILES:%=%.bdf) -PCF_FILES = $(FONT_FILES:%=%.pcf.gz) +PCF_FILES = $(FONT_FILES:%=%.pcf$(COMPRESS_SUFFIX)) -SUFFIXES = .bdf .pcf.gz +SUFFIXES = .bdf .pcf$(COMPRESS_SUFFIX) -.bdf.pcf.gz: +.bdf.pcf$(COMPRESS_SUFFIX): @rm -f $@ - $(BDFTOPCF) -t $< | gzip > $@ + $(AM_V_GEN)$(BDFTOPCF) -t $< | $(COMPRESS) > $@ fontdir = @FONTDIR@ font_DATA = $(PCF_FILES) @@ -65,10 +65,9 @@ CLEANFILES = $(font_DATA) EXTRA_DIST = $(BDF_FILES) install-data-hook: - @rm -f $(DESTDIR)$(fontdir)/fonts.scale - $(MKFONTSCALE) $(DESTDIR)$(fontdir) @rm -f $(DESTDIR)$(fontdir)/font.dir $(MKFONTDIR) $(DESTDIR)$(fontdir) + @RUN_FCCACHE@ distuninstallcheck: @: diff --git a/configure.ac b/configure.ac index 26ab1f1..8251e5a 100644 --- a/configure.ac +++ b/configure.ac @@ -26,28 +26,20 @@ AC_INIT(font-bitstream-100dpi, [1.0.0], [https://bugs.freedesktop.org/enter_bug. 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 +# 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 -AC_PATH_PROG(BDFTOPCF, bdftopcf) -AC_PATH_PROG(MKFONTSCALE, mkfontscale) -if test x"$MKFONTSCALE" = x; then - AC_MSG_ERROR([mkfontscale is required to build bitstream-100dpi fonts.]) -fi -AC_PATH_PROG(MKFONTDIR, mkfontdir) -if test x"$MKFONTDIR" = x; then - AC_MSG_ERROR([mkfontdir is required to build bitstream-100dpi fonts.]) -fi +AC_PROG_INSTALL -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) +# 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_FONTDIR([100dpi]) +XORG_FONT_BDF_UTILS AC_OUTPUT([Makefile]) |