Commit 838086af authored by Mark McLoughlin's avatar Mark McLoughlin Committed by Mark McLoughlin
Browse files

add support for the GCONF_SCHEMAS_INSTALL conditional and the

2003-02-17  Mark McLoughlin  <mark@skynet.ie>

        * Makefile.am: add support for the GCONF_SCHEMAS_INSTALL
        conditional and the GCONF_SCHEMA_FILE_DIR variable. Patch
        from Julio Merino.
parent 32596c30
2003-02-17 Mark McLoughlin <mark@skynet.ie>
* Makefile.am: add support for the GCONF_SCHEMAS_INSTALL
conditional and the GCONF_SCHEMA_FILE_DIR variable.
2003-01-30 Mark McLoughlin <mark@skynet.ie>
* Makefile.am: remove clock.h.
......
......@@ -50,12 +50,13 @@ server_DATA = $(server_in_files:.server.in=.server)
@INTLTOOL_SERVER_RULE@
schemasdir = $(sysconfdir)/gconf/schemas
schemasdir = $(GCONF_SCHEMA_FILE_DIR)
schemas_in_files = clock.schemas.in
schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
@INTLTOOL_SCHEMAS_RULE@
if GCONF_SCHEMAS_INSTALL
# don't do this if we are building in eg. rpm
install-data-local:
if test -z "$(DESTDIR)" ; then \
......@@ -63,6 +64,9 @@ install-data-local:
GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/applets/clock/$$p ; \
done \
fi
else
install-data-local:
endif
EXTRA_DIST = \
GNOME_ClockApplet_Factory.server.in.in \
......
2003-02-17 Mark McLoughlin <mark@skynet.ie>
* Makefile.am: add support for the GCONF_SCHEMAS_INSTALL
conditional and the GCONF_SCHEMA_FILE_DIR variable.
2003-01-03 Muktha <muktha.narayan@wipro.com>
Fixes #102409.
......
......@@ -59,12 +59,13 @@ $(server_in_files): $(server_in_files).in
@INTLTOOL_SERVER_RULE@
schemasdir = $(sysconfdir)/gconf/schemas
schemasdir = $(GCONF_SCHEMA_FILE_DIR)
schemas_in_files = fish.schemas.in
schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
@INTLTOOL_SCHEMAS_RULE@
if GCONF_SCHEMAS_INSTALL
# don't do this if we are building in eg. rpm
install-data-local:
if test -z "$(DESTDIR)" ; then \
......@@ -72,6 +73,9 @@ install-data-local:
GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/applets/fish/$$p ; \
done \
fi
else
install-data-local:
endif
EGGDIR = $(srcdir)/../../../libegg/libegg/screen-exec
......
2003-02-17 Mark McLoughlin <mark@skynet.ie>
* Makefile.am: add support for the GCONF_SCHEMAS_INSTALL
conditional and the GCONF_SCHEMA_FILE_DIR variable.
2003-01-27 Mark McLoughlin <mark@skynet.ie>
* GNOME_MailcheckApplet_Factory.server.in.in,
......
......@@ -70,12 +70,13 @@ server_DATA = $(server_in_files:.server.in=.server)
@INTLTOOL_SERVER_RULE@
schemasdir = $(sysconfdir)/gconf/schemas
schemasdir = $(GCONF_SCHEMA_FILE_DIR)
schemas_in_files = mailcheck.schemas.in
schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
@INTLTOOL_SCHEMAS_RULE@
if GCONF_SCHEMAS_INSTALL
# don't do this if we are building in eg. rpm
install-data-local:
if test -z "$(DESTDIR)" ; then \
......@@ -83,6 +84,9 @@ install-data-local:
GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/applets/mailcheck/$$p ; \
done \
fi
else
install-data-local:
endif
EXTRA_DIST = \
GNOME_MailcheckApplet_Factory.server.in.in \
......
2003-02-17 Mark McLoughlin <mark@skynet.ie>
* Makefile.am: add support for the GCONF_SCHEMAS_INSTALL
conditional and the GCONF_SCHEMA_FILE_DIR variable.
2003-01-22 Arvind Samptur <arvind.samptur@wipro.com>
* workspace-switcher.c: (workspace_name_edited): ignore the
leading and trailing whitespaces on a workspace rename.
......
......@@ -94,12 +94,13 @@ EGGDIR = $(srcdir)/../../../libegg/libegg/screen-exec
regenerate-built-sources:
EGGFILES="$(EGGFILES)" EGGDIR="$(EGGDIR)" $(srcdir)/update-from-egg.sh
schemasdir = $(sysconfdir)/gconf/schemas
schemasdir = $(GCONF_SCHEMA_FILE_DIR)
schemas_in_files = workspace-switcher.schemas.in window-list.schemas.in
schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
@INTLTOOL_SCHEMAS_RULE@
if GCONF_SCHEMAS_INSTALL
# don't do this if we are building in eg. rpm
install-data-local:
if test -z "$(DESTDIR)" ; then \
......@@ -107,6 +108,9 @@ install-data-local:
GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/applets/wncklet/$$p ; \
done \
fi
else
install-data-local:
endif
gladedir = $(datadir)/gen_util
glade_DATA = workspace-switcher.glade window-list.glade
......
2003-02-17 Mark McLoughlin <mark@skynet.ie>
* Makefile.am: add support for the GCONF_SCHEMAS_INSTALL
conditional and the GCONF_SCHEMA_FILE_DIR variable. Patch
from Julio Merino.
2003-02-14 Arvind Samptur <arvind.samptur@wipro.com>
* applet.c: (applet_idle_remove) Deleting the drawer panel
using the drawer button queries the user.
......
......@@ -320,7 +320,7 @@ rc_DATA = gnome-panelrc
@INTLTOOL_SERVER_RULE@
schemasdir = $(sysconfdir)/gconf/schemas
schemasdir = $(GCONF_SCHEMA_FILE_DIR)
schemas_in_files = \
panel-global-config.schemas.in \
panel-per-panel-config.schemas.in \
......@@ -330,12 +330,16 @@ schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
@INTLTOOL_SCHEMAS_RULE@
if GCONF_SCHEMAS_INSTALL
install-data-local:
if test -z "$(DESTDIR)" ; then \
for p in $(schemas_DATA) ; do \
GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/gnome-panel/$$p ; \
done \
fi
else
install-data-local:
endif
CLEANFILES = $(BUILT_SOURCES)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment