Add the relative path for <include> to fonts.conf if the parent path is same to fonts.conf

Bug 69836 - fonts.conf.in update for Windows cross-compiling
This commit is contained in:
Akira TAGOH 2013-09-30 11:30:00 +09:00
parent 96c5f3cf0f
commit 9161ed1e4a
1 changed files with 3 additions and 1 deletions

View File

@ -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 && \