[Fontconfig] fontconfig: Branch 'master' - 2 commits

Akira TAGOH tagoh at kemper.freedesktop.org
Sun Sep 29 19:30:24 PDT 2013


 Makefile.am        |    4 +++-
 conf.d/Makefile.am |    2 +-
 configure.ac       |    6 +-----
 3 files changed, 5 insertions(+), 7 deletions(-)

New commits:
commit 9161ed1e4a3f4afaee6dbcfc0b84a279ad99b397
Author: Akira TAGOH <akira at tagoh.org>
Date:   Mon Sep 30 11:30:00 2013 +0900

    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

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, at FC_CACHEDIR\@,$(FC_CACHEDIR),g' \
 		-e 's, at FC_DEFAULT_FONTS\@,$(FC_DEFAULT_FONTS),g' \
 		-e 's, at FC_FONTPATH\@,$(FC_FONTPATH),g' \
-		-e 's, at CONFIGDIR\@,$(CONFIGDIR),g' \
+		-e 's, at CONFIGDIR\@,$(FC_CONFIGDIR),g' \
 		-e 's, at PACKAGE\@,$(PACKAGE),g' \
 		-e 's, at VERSION\@,$(VERSION),g' \
 		$(srcdir)/$@.in > $@.tmp && \
commit 96c5f3cf0ff57e7bbb08cc1e0e78ed0542096484
Author: Akira TAGOH <akira at tagoh.org>
Date:   Thu Sep 26 18:44:10 2013 +0900

    clean up

diff --git a/conf.d/Makefile.am b/conf.d/Makefile.am
index e1fab50..d61756b 100644
--- a/conf.d/Makefile.am
+++ b/conf.d/Makefile.am
@@ -45,7 +45,7 @@ CONF_LINKS = \
 EXTRA_DIST = $(template_DATA) $(DOC_SOURCES)
 CLEANFILES = $(DOC_FILES)
 
-configdir=$(CONFIGDIR)
+configdir = $(CONFIGDIR)
 config_DATA = $(DOC_FILES)
 
 templatedir = $(TEMPLATEDIR)
diff --git a/configure.ac b/configure.ac
index 952e737..4b631bd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -588,7 +588,7 @@ no|yes)
 esac
 case "$configdir" in
 no|yes)
-	configdir='${baseconfigdir}'/conf.d
+	configdir='${BASECONFIGDIR}'/conf.d
 	;;
 *)
 	;;
@@ -605,13 +605,9 @@ TEMPLATEDIR=${templatedir}
 BASECONFIGDIR=${baseconfigdir}
 CONFIGDIR=${configdir}
 XMLDIR=${xmldir}
-AC_SUBST(templatedir)
 AC_SUBST(TEMPLATEDIR)
-AC_SUBST(baseconfigdir)
 AC_SUBST(BASECONFIGDIR)
-AC_SUBST(configdir)
 AC_SUBST(CONFIGDIR)
-AC_SUBST(xmldir)
 AC_SUBST(XMLDIR)
 
 


More information about the Fontconfig mailing list