summaryrefslogtreecommitdiff
path: root/fonts/fontconfig/patches/patch-aa
blob: a0f73b67d28443c3806bcd4a550a62baf060fd04 (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.11 2007/08/01 16:33:39 joerg Exp $

--- Makefile.in.orig	2006-12-03 00:27:34.000000000 +0100
+++ Makefile.in
@@ -258,7 +258,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 \
@@ -274,10 +274,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
 
@@ -785,7 +786,8 @@ $(srcdir)/ChangeLog:
 .PHONY: ChangeLog $(srcdir)/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; \