44 lines
1.8 KiB
Plaintext
44 lines
1.8 KiB
Plaintext
$NetBSD: patch-aa,v 1.18 2013/10/17 07:27:33 wiz Exp $
|
|
|
|
--- Makefile.in.orig 2013-10-11 04:28:46.000000000 +0000
|
|
+++ Makefile.in
|
|
@@ -380,6 +380,7 @@ datadir = @datadir@
|
|
datarootdir = @datarootdir@
|
|
docdir = @docdir@
|
|
dvidir = @dvidir@
|
|
+egdir = $(prefix)/emul/netbsd32/share/examples/fontconfig
|
|
exec_prefix = @exec_prefix@
|
|
fc_cachedir = @fc_cachedir@
|
|
host = @host@
|
|
@@ -439,6 +440,7 @@ xml_DATA = fonts.dtd
|
|
@CROSS_COMPILING_TRUE@RUN_FC_CACHE_TEST = false
|
|
FC_CONFIGDIR = $(subst $(BASECONFIGDIR)/,,$(CONFIGDIR))
|
|
DISTCHECK_CONFIGURE_FLAGS =
|
|
+RUN_FC_CACHE_TEST = false
|
|
all: config.h
|
|
$(MAKE) $(AM_MAKEFLAGS) all-recursive
|
|
|
|
@@ -997,17 +999,13 @@ fonts.conf: fonts.conf.in Makefile
|
|
mv $@.tmp $@
|
|
|
|
install-data-local: fonts.conf
|
|
- $(mkinstalldirs) $(DESTDIR)$(baseconfigdir) $(DESTDIR)$(fc_cachedir)
|
|
- if [ -f $(DESTDIR)$(baseconfigdir)/fonts.conf ]; then \
|
|
- echo "backing up existing $(DESTDIR)$(baseconfigdir)/fonts.conf"; \
|
|
- mv $(DESTDIR)$(baseconfigdir)/fonts.conf $(DESTDIR)$(baseconfigdir)/fonts.conf.bak; \
|
|
- fi
|
|
+ $(mkinstalldirs) $(DESTDIR)$(egdir)
|
|
if [ -f $(srcdir)/fonts.conf ]; then \
|
|
- echo " $(INSTALL_DATA) $(srcdir)/fonts.conf $(DESTDIR)$(baseconfigdir)/fonts.conf"; \
|
|
- $(INSTALL_DATA) $(srcdir)/fonts.conf $(DESTDIR)$(baseconfigdir)/fonts.conf; \
|
|
+ echo " $(INSTALL_DATA) $(srcdir)/fonts.conf $(DESTDIR)$(egdir)/fonts.conf"; \
|
|
+ $(INSTALL_DATA) $(srcdir)/fonts.conf $(DESTDIR)$(egdir)/fonts.conf; \
|
|
else if [ -f fonts.conf ]; then \
|
|
- echo " $(INSTALL_DATA) fonts.conf $(DESTDIR)$(baseconfigdir)/fonts.conf"; \
|
|
- $(INSTALL_DATA) fonts.conf $(DESTDIR)$(baseconfigdir)/fonts.conf; \
|
|
+ echo " $(INSTALL_DATA) fonts.conf $(DESTDIR)$(egdir)/fonts.conf"; \
|
|
+ $(INSTALL_DATA) fonts.conf $(DESTDIR)$(egdir)/fonts.conf; \
|
|
fi; fi
|
|
@(if $(RUN_FC_CACHE_TEST); then \
|
|
echo "fc-cache$(EXEEXT) -s -f -v"; \
|