diff options
Diffstat (limited to 'data/Makefile.am')
| -rw-r--r-- | data/Makefile.am | 27 |
1 files changed, 8 insertions, 19 deletions
diff --git a/data/Makefile.am b/data/Makefile.am index ffdaa39..afe1950 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,9 +1,9 @@ SUBDIRS = keyboards -schemasdir = $(GCONF_SCHEMA_FILE_DIR) -schemas_in_files = caribou.schemas.in -schemas_DATA = $(schemas_in_files:.schemas.in=.schemas) -@INTLTOOL_SCHEMAS_RULE@ +@GSETTINGS_RULES@ +@INTLTOOL_XML_NOMERGE_RULE@ +gsettings_schemas_in_files = org.gnome.caribou.gschema.xml.in +gsettings_SCHEMAS = $(gsettings_schemas_in_files:.gschema.xml.in=.gschema.xml) desktopdir = $(datadir)/applications desktop_in_files = caribou.desktop.in @@ -12,20 +12,9 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) EXTRA_DIST = $(desktop_in_files) -caribou.schemas.in: $(top_srcdir)/caribou/common/settings.py - PYTHONPATH=$(top_srcdir) $(PYTHON) $< > $@ +org.gnome.caribou.gschema.xml.in: $(top_srcdir)/caribou/common/settings.py + PYTHONPATH=${PYTHONPATH}:$(top_srcdir) $(PYTHON) $< > $@ CLEANFILES = $(desktop_DATA) \ - $(schemas_in_files) \ - $(schemas_DATA) - -# installation of schemas -if GCONF_SCHEMAS_INSTALL -install-data-hook: - GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \ - $(GCONFTOOL) --makefile-install-rule $(schemas_DATA) - -uninstall-hook: - GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \ - $(GCONFTOOL) --makefile-uninstall-rule $(schemas_DATA) -endif + $(gsettings_schemas_in_files) \ + $(gsettings_SCHEMAS) |