fontconfig: Branch 'master'

 Makefile.am         |    2 +-
 configure.ac        |    1 +
 its/Makefile.am     |    6 ++++++
 po-conf/Makevars    |    4 ++--
 po-conf/POTFILES.in |   34 ++++++++++++++++++++++++++++++++++
 src/Makefile.am     |    5 -----
 6 files changed, 44 insertions(+), 8 deletions(-)

New commits:
commit 97488fd72577a86ffd52bbb42d781bad0dd723cf
Author: Akira TAGOH <[email protected]>
Date:   Sat Jan 6 18:53:27 2018 +0900

    export GETTEXTDATADIR to refer the local .its/.loc file instead of using --its option

diff --git a/Makefile.am b/Makefile.am
index 00ea568..cc3024e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,7 +24,7 @@
 SUBDIRS=fontconfig fc-case fc-lang src \
 	fc-cache fc-cat fc-conflist fc-list fc-match \
 	fc-pattern fc-query fc-scan fc-validate conf.d \
-	po po-conf test
+	its po po-conf test
 if ENABLE_DOCS
 SUBDIRS += doc
 endif
diff --git a/configure.ac b/configure.ac
index c48180f..e80479e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -778,6 +778,7 @@ fc-scan/Makefile
 fc-validate/Makefile
 doc/Makefile
 doc/version.sgml
+its/Makefile
 po/Makefile.in
 po-conf/Makefile.in
 test/Makefile
diff --git a/its/Makefile.am b/its/Makefile.am
new file mode 100644
index 0000000..87e77a1
--- /dev/null
+++ b/its/Makefile.am
@@ -0,0 +1,6 @@
+gettextitsdir = $(datadir)/gettext/its
+gettextits_DATA =	\
+	fontconfig.its	\
+	fontconfig.loc
+
+-include $(top_srcdir)/git.mk
diff --git a/src/fontconfig.its b/its/fontconfig.its
similarity index 100%
rename from src/fontconfig.its
rename to its/fontconfig.its
diff --git a/src/fontconfig.loc b/its/fontconfig.loc
similarity index 100%
rename from src/fontconfig.loc
rename to its/fontconfig.loc
diff --git a/po-conf/Makevars b/po-conf/Makevars
index 8411821..abbd220 100644
--- a/po-conf/Makevars
+++ b/po-conf/Makevars
@@ -8,7 +8,7 @@ subdir = po-conf
 top_builddir = ..
 
 # These options get passed to xgettext.
-XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ --its=$(top_srcdir)/src/fontconfig.its
+XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
 
 # This is the copyright holder that gets inserted into the header of the
 # $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding
@@ -77,4 +77,4 @@ PO_DEPENDS_ON_POT = yes
 # externally.
 DIST_DEPENDS_ON_UPDATE_PO = yes
 
-
+$(DOMAIN).pot-update: export GETTEXTDATADIR = $(top_srcdir)
diff --git a/po-conf/POTFILES.in b/po-conf/POTFILES.in
index e69de29..f4846ac 100644
--- a/po-conf/POTFILES.in
+++ b/po-conf/POTFILES.in
@@ -0,0 +1,34 @@
+conf.d/10-autohint.conf
+conf.d/10-hinting-full.conf
+conf.d/10-hinting-medium.conf
+conf.d/10-hinting-none.conf
+conf.d/10-hinting-slight.conf
+conf.d/10-no-sub-pixel.conf
+conf.d/10-scale-bitmap-fonts.conf
+conf.d/10-sub-pixel-bgr.conf
+conf.d/10-sub-pixel-rgb.conf
+conf.d/10-sub-pixel-vbgr.conf
+conf.d/10-sub-pixel-vrgb.conf
+conf.d/10-unhinted.conf
+conf.d/11-lcdfilter-default.conf
+conf.d/11-lcdfilter-legacy.conf
+conf.d/11-lcdfilter-light.conf
+conf.d/20-unhint-small-vera.conf
+conf.d/25-unhint-nonlatin.conf
+conf.d/30-metric-aliases.conf
+conf.d/40-nonlatin.conf
+conf.d/45-generic.conf
+conf.d/45-latin.conf
+conf.d/49-sansserif.conf
+conf.d/50-user.conf
+conf.d/51-local.conf
+conf.d/60-generic.conf
+conf.d/60-latin.conf
+conf.d/65-fonts-persian.conf
+conf.d/65-khmer.conf
+conf.d/65-nonlatin.conf
+conf.d/69-unifont.conf
+conf.d/70-no-bitmaps.conf
+conf.d/70-yes-bitmaps.conf
+conf.d/80-delicious.conf
+conf.d/90-synthetic.conf
diff --git a/src/Makefile.am b/src/Makefile.am
index d6c4931..80780b6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -218,9 +218,4 @@ fontconfig.def: $(PUBLIC_FILES) $(PUBLIC_FT_FILES)
 	echo VERSION @LIBT_CURRENT@.@LIBT_REVISION@) >$@
 	@ ! $(GREP) -q FcERROR $@ || ($(RM) $@; false)
 
-gettextitsdir = $(datadir)/gettext/its
-gettextits_DATA =	\
-	fontconfig.its	\
-	fontconfig.loc
-
 -include $(top_srcdir)/git.mk
_______________________________________________
Fontconfig mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/fontconfig