diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/Makefile.am | 19 | ||||
| -rw-r--r-- | data/org.gnome.Evince.gschema.xml.in | 2 |
2 files changed, 9 insertions, 12 deletions
diff --git a/data/Makefile.am b/data/Makefile.am index feb5230..31fceaa 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -50,19 +50,16 @@ endif # # GSettings schema # - -# gsettingsschemadir and gschema_compile are defined by the GLIB_GSETTINGS -# macro in configure.ac gsettingsschema_in_files = org.gnome.Evince.gschema.xml.in -gsettingsschema_DATA = $(gsettingsschema_in_files:.xml.in=.xml) +# gsettings_SCHEMAS is a list of all the schemas you want to install +gsettings_SCHEMAS = $(gsettingsschema_in_files:.xml.in=.xml) + +.PRECIOUS: $(gsettings_SCHEMAS) + @INTLTOOL_XML_NOMERGE_RULE@ -# This rule will check your schemas for validity before installation -# Uncomment when porting is done -# GSETTINGS_CHECK_RULE -if GSETTINGS_SCHEMAS_INSTALL -install-data-hook: - $(AM_V_GEN) $(GLIB_COMPILE_SCHEMAS) --allow-any-name $(DESTDIR)$(gsettingsschemadir) --targetdir=$(DESTDIR)$(gsettingsschemadir) -endif + +# include the appropriate makefile rules for schema handling +@GSETTINGS_RULES@ # # GTK icon cache diff --git a/data/org.gnome.Evince.gschema.xml.in b/data/org.gnome.Evince.gschema.xml.in index 19ebf19..3e14a95 100644 --- a/data/org.gnome.Evince.gschema.xml.in +++ b/data/org.gnome.Evince.gschema.xml.in @@ -1,6 +1,6 @@ <schemalist> <schema id="org.gnome.Evince" path="/apps/evince/" gettext-domain="evince"> - <key name="override_restrictions" type="b"> + <key name="override-restrictions" type="b"> <default>true</default> <summary>Override document restrictions</summary> <description>Override document restrictions, like restriction to copy or to print.</description> |