[Fontconfig] fontconfig: Branch 'master'

[GitLab Mirror]

 doc/Makefile.am     |    2 +-
 doc/confdir.sgml.in |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 97d709e888ae01785755ae6c650458cda732064b
Author: Akira TAGOH <akira at tagoh.org>
Date:   Thu Jul 2 13:55:04 2020 +0900

    Fix a typo in doc/confdir.sgml.in
    
    Since changes introduced by e181ab4d

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 2cb6410..36f78da 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -200,7 +200,7 @@ func.refs: local-fontconfig-devel.sgml $(DOCS_DEPS)
 	$(RM) devel-man/manpage.* &&		\
 	rmdir devel-man || rm $@ || :
 confdir.sgml: $(srcdir)/confdir.sgml.in
-	$(AM_V_GEN) sed -e 's, at CONFDIR\@,${CONFDIR},' $(srcdir)/$@.in | awk '{if (NR > 1) printf("\n"); printf("%s", $$0);}' > $@
+	$(AM_V_GEN) sed -e 's, at BASECONFIGDIR\@,${BASECONFIGDIR},' $(srcdir)/$@.in | awk '{if (NR > 1) printf("\n"); printf("%s", $$0);}' > $@
 ##
 $(DOC_FUNCS_SGML): $(DOC_FUNCS_FNCS) edit-sgml$(EXEEXT) $(srcdir)/func.sgml
 $(TXT_FILES): $(DOCS_DEPS)
diff --git a/doc/confdir.sgml.in b/doc/confdir.sgml.in
index cfcaa9f..fd4d737 100644
--- a/doc/confdir.sgml.in
+++ b/doc/confdir.sgml.in
@@ -22,5 +22,5 @@
    PERFORMANCE OF THIS SOFTWARE.
 -->
 <!-- this is filled in at make time -->
-<!-- at CONFDIR@-->
+<!-- at BASECONFIGDIR@-->
 /etc/fonts