diff options
| author | Mark McLoughlin <mark@skynet.ie> | 2002-05-19 22:18:40 +0000 |
|---|---|---|
| committer | Mark McLoughlin <mmclouglin@src.gnome.org> | 2002-05-19 22:18:40 +0000 |
| commit | ed7598a029eb573bfed8fe2b74901ce6bdd84154 (patch) | |
| tree | beeec29bc1ff893f14282fbd47ed113f0280e9cf | |
| parent | d4b8b4c30aecfcd25c638a4b88c01ea7b5af4491 (diff) | |
require intltool-0.20 for .schemas file translation.GNOME_PANEL_1_5_22
2002-05-20 Mark McLoughlin <mark@skynet.ie>
* configure.in: require intltool-0.20 for .schemas
file translation.
2002-05-20 Mark McLoughlin <mark@skynet.ie>
* Makefile.am: generate the .schemas file from the
.schemas.in files.
* panel-global-config.schemas.in:
* panel-per-panel-config.schemas.in: renamed these from
the .schema version - preserving cvs history.
2002-05-20 Mark McLoughlin <mark@skynet.ie>
* Makefile.am: generate .schemas files. Also install
them correctly.
* fish.schemas.in: cvs rename from fish.schemas
2002-05-20 Mark McLoughlin <mark@skynet.ie>
* Makefile.am: generate .schemas from .schemas.in.
* clock.schemas.in:
* mailcheck.schemas.in:
* pager.schemas.in:
* tasklist.schemas.in: rename from *.schemas.
| -rw-r--r-- | mailcheck/ChangeLog | 9 | ||||
| -rw-r--r-- | mailcheck/Makefile.am | 18 |
2 files changed, 21 insertions, 6 deletions
diff --git a/mailcheck/ChangeLog b/mailcheck/ChangeLog index 9eaab49f9..e3cd2147c 100644 --- a/mailcheck/ChangeLog +++ b/mailcheck/ChangeLog @@ -1,3 +1,12 @@ +2002-05-20 Mark McLoughlin <mark@skynet.ie> + + * Makefile.am: generate .schemas from .schemas.in. + + * clock.schemas.in: + * mailcheck.schemas.in: + * pager.schemas.in: + * tasklist.schemas.in: rename from *.schemas. + 2002-05-16 Havoc Pennington <hp@pobox.com> * pager.c (update_workspaces_model): remove call to diff --git a/mailcheck/Makefile.am b/mailcheck/Makefile.am index fe888dfc3..f001fbf9a 100644 --- a/mailcheck/Makefile.am +++ b/mailcheck/Makefile.am @@ -61,9 +61,6 @@ soundlist_DATA = $(soundlist_in_files:.soundlist.in=.soundlist) @INTLTOOL_SOUNDLIST_RULE@ -schemadir = $(sysconfdir)/gconf/schemas -schema_DATA = mailcheck.schemas pager.schemas tasklist.schemas clock.schemas - uidir = $(datadir)/gnome-2.0/ui ui_DATA = \ GNOME_ClockApplet.xml \ @@ -77,11 +74,20 @@ server_DATA = $(server_in_files:.server.in=.server) @INTLTOOL_SERVER_RULE@ +schemasdir = $(sysconfdir)/gconf/schemas +schemas_in_files = mailcheck.schemas.in \ + pager.schemas.in \ + tasklist.schemas.in \ + clock.schemas.in +schemas_DATA = $(schemas_in_files:.schemas.in=.schemas) + +@INTLTOOL_SCHEMAS_RULE@ + # don't do this if we are building in eg. rpm install-data-local: if test -z "$(DESTDIR)" ; then \ - for p in $(schema_DATA) ; do \ - GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$$p ; \ + for p in $(schemas_DATA) ; do \ + GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/applets/gen_util/$$p ; \ done \ fi @@ -89,6 +95,6 @@ EXTRA_DIST = GNOME_GenUtilApplet_Factory.server.in.in \ $(PRINTER_BITMAPS) \ $(MAILCHECK_BITMAPS) \ $(soundlist_in_files) \ - $(schema_DATA) \ + $(schemas_in_files) \ $(glade_DATA) \ $(ui_DATA) |