diff options
| author | marha <marha@users.sourceforge.net> | 2013-09-30 09:00:43 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-09-30 09:00:43 +0200 |
| commit | 3aaead2ee2e0f925b33c1ccbde7fa3c0b119d064 (patch) | |
| tree | b5487ebc7c6056e0b248afc471edf40b90a3b0b4 /fontconfig/Makefile.am | |
| parent | 1245204b2091d108a8688ff7f749f2c6cc830381 (diff) | |
| parent | a12cf779e828ec70da714832e1eaa730119fe10c (diff) | |
| download | vcxsrv-3aaead2ee2e0f925b33c1ccbde7fa3c0b119d064.tar.gz vcxsrv-3aaead2ee2e0f925b33c1ccbde7fa3c0b119d064.tar.bz2 vcxsrv-3aaead2ee2e0f925b33c1ccbde7fa3c0b119d064.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
git update fontconfig mesa libXau pixman xkeyboard-config 30 Sep 2013
Diffstat (limited to 'fontconfig/Makefile.am')
| -rw-r--r-- | fontconfig/Makefile.am | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fontconfig/Makefile.am b/fontconfig/Makefile.am index d310b4b62..2b949e439 100644 --- a/fontconfig/Makefile.am +++ b/fontconfig/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 && \ |