From 9161ed1e4a3f4afaee6dbcfc0b84a279ad99b397 Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Mon, 30 Sep 2013 11:30:00 +0900 Subject: [PATCH] Add the relative path for to fonts.conf if the parent path is same to fonts.conf Bug 69836 - fonts.conf.in update for Windows cross-compiling --- Makefile.am | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index d310b4b..2b949e4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -90,12 +90,14 @@ $(srcdir)/ChangeLog: .PHONY: ChangeLog +FC_CONFIGDIR = $(subst $(BASECONFIGDIR)/,,$(CONFIGDIR)) + fonts.conf: fonts.conf.in Makefile sed \ -e 's,@FC_CACHEDIR\@,$(FC_CACHEDIR),g' \ -e 's,@FC_DEFAULT_FONTS\@,$(FC_DEFAULT_FONTS),g' \ -e 's,@FC_FONTPATH\@,$(FC_FONTPATH),g' \ - -e 's,@CONFIGDIR\@,$(CONFIGDIR),g' \ + -e 's,@CONFIGDIR\@,$(FC_CONFIGDIR),g' \ -e 's,@PACKAGE\@,$(PACKAGE),g' \ -e 's,@VERSION\@,$(VERSION),g' \ $(srcdir)/$@.in > $@.tmp && \