diff options
| author | Marco Pesenti Gritti <mpgritti@gmail.com> | 2008-10-14 13:16:32 (GMT) |
|---|---|---|
| committer | Marco Pesenti Gritti <mpgritti@gmail.com> | 2008-10-14 13:16:32 (GMT) |
| commit | 016c93772e437620eda057b22729b1cc3397237c (patch) | |
| tree | 128e7be80a6be299c3d1aec17359c61c9837eb37 | |
| parent | 0c6dd4e9543946d3ddd7149c07e70e78585f9edf (diff) | |
Fix schemas installation. Also move them in data,
a separat directory for just one schema seems excessive.
| -rw-r--r-- | data/.gitignore | 1 | ||||
| -rw-r--r-- | data/Makefile.am | 15 | ||||
| -rw-r--r-- | data/sugar.schemas.in (renamed from schemas/sugar.schemas.in) | 0 | ||||
| -rw-r--r-- | schemas/Makefile.am | 20 |
4 files changed, 14 insertions, 22 deletions
diff --git a/data/.gitignore b/data/.gitignore index 6fa4af3..8263f12 100644 --- a/data/.gitignore +++ b/data/.gitignore @@ -1 +1,2 @@ *.gtkrc +sugar.schemas diff --git a/data/Makefile.am b/data/Makefile.am index 40e6e36..7623d46 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -46,5 +46,16 @@ if ENABLE_UPDATE_MIMEDB fi endif -EXTRA_DIST = $(sugar_DATA) $(xsessions_DATA) $(nmservice_DATA) $(mime_xml_in_files) em.py gtkrc.em -CLEANFILES = $(GTKRC_FILES) $(mime_xml_files) +@INTLTOOL_SCHEMAS_RULE@ + +schemadir = $(GCONF_SCHEMA_FILE_DIR) +schema_in_files = sugar.schemas.in +schema_DATA = $(schema_in_files:.schemas.in=.schemas) + +install-data-local: $(schema_DATA) +if GCONF_SCHEMAS_INSTALL + GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule sugar.schemas 2>&1 > /dev/null +endif + +EXTRA_DIST = $(sugar_DATA) $(xsessions_DATA) $(nmservice_DATA) $(mime_xml_in_files) em.py gtkrc.em $(schema_in_files) +CLEANFILES = $(GTKRC_FILES) $(mime_xml_files) $(schema_DATA) diff --git a/schemas/sugar.schemas.in b/data/sugar.schemas.in index 5cdff4d..5cdff4d 100644 --- a/schemas/sugar.schemas.in +++ b/data/sugar.schemas.in diff --git a/schemas/Makefile.am b/schemas/Makefile.am deleted file mode 100644 index 0614031..0000000 --- a/schemas/Makefile.am +++ /dev/null @@ -1,20 +0,0 @@ -@INTLTOOL_SCHEMAS_RULE@ - -schemadir = $(GCONF_SCHEMA_FILE_DIR) -schema_in_files = sugar.schemas.in -schema_DATA = $(schema_in_files:.schemas.in=.schemas) - -install-data-local: $(schema_DATA) -if GCONF_SCHEMAS_INSTALL - if test -z "$(DESTDIR)" ; then \ - for p in $^ ; do \ - GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $$p 2>&1 > /dev/null; \ - done \ - fi -endif - -EXTRA_DIST = \ - $(schema_in_files) - -DISTCLEANFILES = \ - $(schema_in_files:.schemas.in=.schemas) |