Fix all applets so they won't install their schemas if the user

configures with --disable-schemas-install

14 files changed, 41 insertions, 18 deletions

diff --git a/battstat/Makefile.am b/battstat/Makefile.am
index 5db1082c8..399b96078 100644
--- a/battstat/Makefile.am
+++ b/battstat/Makefile.am
@@ -31,7 +31,6 @@ INCLUDES = \
 
 
 
-
 libexec_PROGRAMS = battstat-applet-2
 
 
@@ -56,8 +55,10 @@ schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
 
 @INTLTOOL_SCHEMAS_RULE@
 
+if GCONF_SCHEMAS_INSTALL
 install-data-local:
 	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schemas_DATA) ;
+endif
 
 serverdir       = $(libdir)/bonobo/servers
 server_in_files = GNOME_BattstatApplet.server.in
@@ -71,12 +72,13 @@ CLEANFILES = $(server_in_files) $(server_DATA)
 uidir = $(datadir)/gnome-2.0/ui
 ui_DATA = GNOME_BattstatApplet.xml
 
-EXTRA_DIST = 					\
-	$(glade_DATA)				\
-	GNOME_BattstatApplet.server.in.in	\
-	$(ui_DATA)				\
-	$(schemas_in_files)		\
-	battstat.png
+EXTRA_DIST = 			\
+	$(pixmaps_DATA)		\
+	$(glade_DATA)		\
+	$(ui_DATA)		\
+	$(server_in_files)	\
+	$(schemas_in_files)
+
 
 @INTLTOOL_SERVER_RULE@
 
diff --git a/cdplayer/Makefile.am b/cdplayer/Makefile.am
index 6f3a422fa..f3acc12b4 100644
--- a/cdplayer/Makefile.am
+++ b/cdplayer/Makefile.am
@@ -93,5 +93,7 @@ $(schemas_in_files)	\
 $(ui_DATA) \
 $(IMAGES)
 
+if GCONF_SCHEMAS_INSTALL
 install-data-local:
 	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schemas_DATA);
+endif
diff --git a/charpick/Makefile.am b/charpick/Makefile.am
index 24452cedc..26ca51673 100644
--- a/charpick/Makefile.am
+++ b/charpick/Makefile.am
@@ -44,6 +44,7 @@ EXTRA_DIST =					\
 	$(ui_DATA)				\
 	$(schemas_in_files)
 
+if GCONF_SCHEMAS_INSTALL
 install-data-local:
 	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schemas_DATA) ;
-
+endif
diff --git a/drivemount/Makefile.am b/drivemount/Makefile.am
index ef43e2338..a62ef1432 100644
--- a/drivemount/Makefile.am
+++ b/drivemount/Makefile.am
@@ -75,5 +75,7 @@ $(schemas_in_files)	\
 $(ui_DATA)	\
 drivemount-applet.png
 
+if GCONF_SCHEMAS_INSTALL
 install-data-local:
 	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schemas_DATA) ;
+endif
diff --git a/geyes/Makefile.am b/geyes/Makefile.am
index 9c97c9aab..43c5fe1af 100644
--- a/geyes/Makefile.am
+++ b/geyes/Makefile.am
@@ -53,5 +53,7 @@ EXTRA_DIST = \
 	     $(schemas_in_files) \
 	     $(ui_DATA)
 
+if GCONF_SCHEMAS_INSTALL
 install-data-local:
 	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schemas_DATA) ;
+endif
diff --git a/gkb-new/Makefile.am b/gkb-new/Makefile.am
index c3d7e7aab..0e1efa466 100644
--- a/gkb-new/Makefile.am
+++ b/gkb-new/Makefile.am
@@ -60,6 +60,7 @@ gkb_xmmap: gkb_xmmap.in
 	< gkb_xmmap.in >gkb_xmmap.tmp \
 	&& mv gkb_xmmap.tmp gkb_xmmap
 
+if GCONF_SCHEMAS_INSTALL
 install-data-local:
 	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schemas_DATA) ;
-
+endif
diff --git a/gswitchit/Makefile.am b/gswitchit/Makefile.am
index 4a0ebcc6b..b59afbf67 100644
--- a/gswitchit/Makefile.am
+++ b/gswitchit/Makefile.am
@@ -64,10 +64,12 @@ schemas_DATA     = $(schemas_in_files:.schemas.in=.schemas)
 
 @INTLTOOL_SCHEMAS_RULE@
 
+if GCONF_SCHEMAS_INSTALL
 install-data-local:
 	if test -z "$(DESTDIR)" ; then \
           GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schemas_DATA); \
         fi
+endif
 
 pixmapdir = $(datadir)/pixmaps
 pixmap_DATA = gswitchit-applet.png gswitchit-properties-capplet.png
diff --git a/gtik/Makefile.am b/gtik/Makefile.am
index 294ce2113..611b6dbb8 100644
--- a/gtik/Makefile.am
+++ b/gtik/Makefile.am
@@ -47,5 +47,7 @@ EXTRA_DIST = \
 	$(ui_DATA)		\
 	$(schemas_in_files)
 
+if GCONF_SCHEMAS_INSTALL
 install-data-local:
 		GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schemas_DATA) ;
+endif
diff --git a/gweather/Makefile.am b/gweather/Makefile.am
index f2e7accbf..bbf81f4c0 100644
--- a/gweather/Makefile.am
+++ b/gweather/Makefile.am
@@ -35,9 +35,6 @@ schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
 uidir = $(datadir)/gnome-2.0/ui
 ui_DATA = GNOME_GWeatherApplet.xml
 
-install-data-local:
-	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schemas_DATA) ;
-
 serverdir       = $(libdir)/bonobo/servers
 server_in_files = GNOME_GWeatherApplet_Factory.server.in
 server_DATA     = $(server_in_files:.server.in=.server)
@@ -57,3 +54,8 @@ EXTRA_DIST = \
 	Locations
 
 @INTLTOOL_SERVER_RULE@
+
+if GCONF_SCHEMAS_INSTALL
+install-data-local:
+	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schemas_DATA) ;
+endif
diff --git a/mini-commander/src/Makefile.am b/mini-commander/src/Makefile.am
index 6b54a8745..6cedd76ae 100644
--- a/mini-commander/src/Makefile.am
+++ b/mini-commander/src/Makefile.am
@@ -77,9 +77,11 @@ schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
 uidir = $(datadir)/gnome-2.0/ui
 ui_DATA = GNOME_MiniCommanderApplet.xml
 
+if GCONF_SCHEMAS_INSTALL
 install-data-local:
 	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schemas_DATA) ;
 	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(top_builddir)/mini-commander/src/mc-install-default-macros
+endif
 
 @INTLTOOL_SERVER_RULE@
 
diff --git a/mixer/Makefile.am b/mixer/Makefile.am
index 266162205..424dcb1ce 100644
--- a/mixer/Makefile.am
+++ b/mixer/Makefile.am
@@ -51,5 +51,7 @@ EXTRA_DIST = 						\
 
 CLEANFILES = $(server_in_files) $(server_DATA)
 
+if GCONF_SCHEMAS_INSTALL
 install-data-local:
 	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schemas_DATA) ;
+endif
diff --git a/modemlights/Makefile.am b/modemlights/Makefile.am
index 2e3093c94..8d0cb4da0 100644
--- a/modemlights/Makefile.am
+++ b/modemlights/Makefile.am
@@ -43,8 +43,9 @@ EXTRA_DIST =					\
 	$(schemas_in_files)				\
 	$(ui_DATA)
 
+if GCONF_SCHEMAS_INSTALL
 install-data-local:
 	for p in $(schemas_DATA); do \
 		GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $$p ; \
 	done
-
+endif
diff --git a/multiload/Makefile.am b/multiload/Makefile.am
index 3e7b12204..8cf9dd031 100644
--- a/multiload/Makefile.am
+++ b/multiload/Makefile.am
@@ -40,10 +40,6 @@ schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
 
 @INTLTOOL_SCHEMAS_RULE@
 
-
-install-data-local:
-	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schemas_DATA) ;
-
 EXTRA_DIST =	\
 		GNOME_MultiLoadApplet_Factory.server.in.in \
 		$(schemas_in_files) \
@@ -63,3 +59,8 @@ $(server_in_files): $(server_in_files:.server.in=.server.in.in)
 CLEANFILES = $(server_in_files) $(server_DATA)
 
 @INTLTOOL_SERVER_RULE@
+
+if GCONF_SCHEMAS_INSTALL
+install-data-local:
+	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schemas_DATA) ;
+endif
diff --git a/stickynotes/Makefile.am b/stickynotes/Makefile.am
index 9ef541ab0..7e9f272d0 100644
--- a/stickynotes/Makefile.am
+++ b/stickynotes/Makefile.am
@@ -64,8 +64,9 @@ EXTRA_DIST = \
 	     $(schemas_in_files) \
 	     GNOME_StickyNotesApplet.server.in.in
 
+if GCONF_SCHEMAS_INSTALL
 install-data-local:
 	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \
 	$(GCONFTOOL) --makefile-install-rule $(schemas_DATA)
 	$(GCONFTOOL) --shutdown
-
+endif