summaryrefslogtreecommitdiff
path: root/fonts/fontconfig/patches/patch-aa
blob: 4f25e6aa4f54c8799114cba2b88cb082ce3bae39 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
$NetBSD: patch-aa,v 1.12 2007/11/30 22:31:16 wiz Exp $

--- Makefile.in.orig	2007-11-14 02:57:09.000000000 +0000
+++ Makefile.in
@@ -259,7 +259,7 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-SUBDIRS = fontconfig fc-case fc-lang fc-glyphname fc-arch src \
+SUBDIRS = fontconfig fc-case fc-lang fc-glyphname src \
 	fc-cache fc-cat fc-list fc-match conf.d $(DOCSRC) test
 
 EXTRA_DIST = fontconfig.pc.in fonts.conf.in fonts.dtd \
@@ -275,10 +275,11 @@ MAINTAINERCLEANFILES = $(srcdir)/aclocal
 	-type f -name Makefile.in -print` ChangeLog
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = fontconfig.pc
-configdir = $(CONFDIR)
+configdir = $(prefix)/share/examples/fontconfig
 config_DATA = fonts.dtd
 @CROSS_COMPILING_FALSE@RUN_FC_CACHE_TEST = test -z "$(DESTDIR)"
 @CROSS_COMPILING_TRUE@RUN_FC_CACHE_TEST = false
+RUN_FC_CACHE_TEST = false
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
@@ -783,7 +784,8 @@ ChangeLog:
 .PHONY: ChangeLog
 
 install-data-local:
-	$(mkinstalldirs) $(DESTDIR)$(configdir) $(DESTDIR)$(fc_cachedir)
+	$(mkinstalldirs) $(DESTDIR)$(configdir)
+	$(mkinstalldirs) $(DESTDIR)$(fc_cachedir)
 	if [ -f $(DESTDIR)$(configdir)/fonts.conf ]; then \
 	  echo "backing up existing $(DESTDIR)$(configdir)/fonts.conf"; \
 	  mv $(DESTDIR)$(configdir)/fonts.conf $(DESTDIR)$(configdir)/fonts.conf.bak; \