diff options
| author | marha <marha@users.sourceforge.net> | 2013-09-30 08:58:27 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-09-30 08:58:27 +0200 |
| commit | a12cf779e828ec70da714832e1eaa730119fe10c (patch) | |
| tree | dc99a80ba8d23ac18d2a33ebaa4cbdeef65ffb72 /fontconfig/Makefile.am | |
| parent | 14718f10dcda487178690de9a51cc5acdf21e468 (diff) | |
| download | vcxsrv-a12cf779e828ec70da714832e1eaa730119fe10c.tar.gz vcxsrv-a12cf779e828ec70da714832e1eaa730119fe10c.tar.bz2 vcxsrv-a12cf779e828ec70da714832e1eaa730119fe10c.zip | |
git update fontconfig mesa libXau pixman xkeyboard-config 30 Sep 2013
xkeyboard-config commit fe5c2416314fd1df423c8ce53cac2d28b00420e7
libXau commit 304a11be4727c5a7feeb2501e8e001466f8ce84e
pixman commit b513b3dffe979056dbbbdc8e0659f8018c51c5f5
fontconfig commit 9161ed1e4a3f4afaee6dbcfc0b84a279ad99b397
mesa commit 868791f0baa0b51f4255c839448d3ca87ab1aa35
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 && \ |