diff options
| author | Emmanuele Bassi <ebassi@gnome.org> | 2015-04-02 18:41:16 +0100 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@gnome.org> | 2015-04-02 18:41:16 +0100 |
| commit | 622735a9f6f7ca7745d48b280d5efa22833fcada (patch) | |
| tree | 9f272989bb8cef06266f4204d7708f9d6b69d0c4 | |
| parent | f07331c56d92b7bdfb0134ad0821c71992c0d3fa (diff) | |
| download | gnome-dictionary-622735a9f6f7ca7745d48b280d5efa22833fcada.tar.gz | |
Drop unnecessary double indirection when generating schemas
We don't need to expand the gettext package symbol: we know we are using
gnome-dictionary, and we're not going to change it.
We also should take extra-care to have intltool not merge the
translations into the XML itself, otherwise glib-compile-schemas will
rightfully complain about invalid XML.
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | data/Makefile.am | 3 | ||||
| -rw-r--r-- | data/org.gnome.dictionary.gschema.xml.in (renamed from data/org.gnome.dictionary.gschema.xml.in.in) | 2 | ||||
| -rw-r--r-- | po/POTFILES.in | 2 |
4 files changed, 5 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 5021b00..9e7ff81 100644 --- a/configure.ac +++ b/configure.ac @@ -175,7 +175,6 @@ AC_CONFIG_FILES([ libgdict/gdict-version.h libgdict/gdict-1.0.pc data/Makefile - data/org.gnome.dictionary.gschema.xml.in docs/Makefile docs/reference/Makefile docs/reference/gdict/Makefile diff --git a/data/Makefile.am b/data/Makefile.am index 103782f..78be666 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -53,4 +53,7 @@ CLEANFILES += $(gsettings_SCHEMAS) \ @GSETTINGS_RULES@ +%.gschema.xml: %.gschema.xml.in + $(AM_V_GEN) $(INTLTOOL_MERGE) -x -u --no-translations $< $@ + -include $(top_srcdir)/git.mk diff --git a/data/org.gnome.dictionary.gschema.xml.in.in b/data/org.gnome.dictionary.gschema.xml.in index a04f3b4..cd7312d 100644 --- a/data/org.gnome.dictionary.gschema.xml.in.in +++ b/data/org.gnome.dictionary.gschema.xml.in @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <schemalist> - <schema id="org.gnome.dictionary" path="/org/gnome/dictionary/" gettext-domain="@GETTEXT_PACKAGE@"> + <schema id="org.gnome.dictionary" path="/org/gnome/dictionary/" gettext-domain="gnome-dictionary"> <key name="database" type="s"> <default>'!'</default> <_summary>The default database to use</_summary> diff --git a/po/POTFILES.in b/po/POTFILES.in index b8aa0cf..0174534 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -6,7 +6,7 @@ data/org.gnome.Dictionary.appdata.xml.in [type: gettext/glade]src/gdict-pref-dialog.ui [type: gettext/glade]src/gdict-source-dialog.ui data/org.gnome.Dictionary.desktop.in.in -data/org.gnome.dictionary.gschema.xml.in.in +data/org.gnome.dictionary.gschema.xml data/spanish.desktop.in data/thai.desktop.in libgdict/gdict-client-context.c |