--- gnome-panel-2.6.1/gnome-panel/Makefile.orig	2004-05-10 17:35:43.000000000 -0400
+++ gnome-panel-2.6.1/gnome-panel/Makefile	2004-05-10 17:39:49.000000000 -0400
@@ -84,7 +84,7 @@
 GCONF_REQUIRED = 2.6.1
 GCONF_SCHEMAS_INSTALL_FALSE = #
 GCONF_SCHEMAS_INSTALL_TRUE = 
-GCONF_SCHEMA_CONFIG_SOURCE = xml::/etc/gconf/gconf.xml.defaults
+GCONF_SCHEMA_CONFIG_SOURCE = xml::$(DESTDIR)/etc/gconf/gconf.xml.defaults
 GCONF_SCHEMA_FILE_DIR = $(sysconfdir)/gconf/schemas/
 GDK_PIXBUF_CSOURCE = /usr/bin/gdk-pixbuf-csource
 GDK_PIXBUF_REQUIRED = 2.1.0
@@ -1180,13 +1180,11 @@
 %.schemas:   %.schemas.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -s -u -c $(top_builddir)/po/.intltool-merge-cache
 
 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 ; \
-		$(GCONFTOOL) --direct --config-source=$(GCONF_SCHEMA_CONFIG_SOURCE) --load $(srcdir)/panel-default-setup.entries ; \
-		$(GCONFTOOL) --direct --config-source=$(GCONF_SCHEMA_CONFIG_SOURCE) --load $(srcdir)/panel-default-setup.entries /apps/panel/profiles/default ; \
-	fi
+	for p in $(schemas_DATA) ; do \
+		GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/gnome-panel/$$p ; \
+	done ; \
+	$(GCONFTOOL) --direct --config-source=$(GCONF_SCHEMA_CONFIG_SOURCE) --load $(srcdir)/panel-default-setup.entries ; \
+	$(GCONFTOOL) --direct --config-source=$(GCONF_SCHEMA_CONFIG_SOURCE) --load $(srcdir)/panel-default-setup.entries /apps/panel/profiles/default ; \
 #install-data-local:
 
 dist-hook:
--- gnome-panel-2.6.1/applets/clock/Makefile.orig	2004-05-10 17:35:45.000000000 -0400
+++ gnome-panel-2.6.1/applets/clock/Makefile	2004-05-10 17:40:40.000000000 -0400
@@ -84,7 +84,7 @@
 GCONF_REQUIRED = 2.6.1
 GCONF_SCHEMAS_INSTALL_FALSE = #
 GCONF_SCHEMAS_INSTALL_TRUE = 
-GCONF_SCHEMA_CONFIG_SOURCE = xml::/etc/gconf/gconf.xml.defaults
+GCONF_SCHEMA_CONFIG_SOURCE = xml::$(DESTDIR)/etc/gconf/gconf.xml.defaults
 GCONF_SCHEMA_FILE_DIR = $(sysconfdir)/gconf/schemas/
 GDK_PIXBUF_CSOURCE = /usr/bin/gdk-pixbuf-csource
 GDK_PIXBUF_REQUIRED = 2.1.0
@@ -759,11 +759,9 @@
 
 # don't do this if we are building in eg. rpm
 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)/applets/clock/$$p ; \
-		done \
-	fi
+	for p in $(schemas_DATA) ; do \
+	        GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/applets/clock/$$p ; \
+	done
 #install-data-local:
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- gnome-panel-2.6.1/applets/fish/Makefile.orig	2004-05-10 17:35:46.000000000 -0400
+++ gnome-panel-2.6.1/applets/fish/Makefile	2004-05-10 17:41:08.000000000 -0400
@@ -84,7 +84,7 @@
 GCONF_REQUIRED = 2.6.1
 GCONF_SCHEMAS_INSTALL_FALSE = #
 GCONF_SCHEMAS_INSTALL_TRUE = 
-GCONF_SCHEMA_CONFIG_SOURCE = xml::/etc/gconf/gconf.xml.defaults
+GCONF_SCHEMA_CONFIG_SOURCE = xml::$(DESTDIR)/etc/gconf/gconf.xml.defaults
 GCONF_SCHEMA_FILE_DIR = $(sysconfdir)/gconf/schemas/
 GDK_PIXBUF_CSOURCE = /usr/bin/gdk-pixbuf-csource
 GDK_PIXBUF_REQUIRED = 2.1.0
@@ -715,11 +715,9 @@
 
 # don't do this if we are building in eg. rpm
 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)/applets/fish/$$p ; \
-	done \
-	fi
+	for p in $(schemas_DATA) ; do \
+		GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/applets/fish/$$p ; \
+	done
 #install-data-local:
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
--- gnome-panel-2.6.1/applets/wncklet/Makefile.orig	2004-05-10 17:35:46.000000000 -0400
+++ gnome-panel-2.6.1/applets/wncklet/Makefile	2004-05-10 17:41:21.000000000 -0400
@@ -84,7 +84,7 @@
 GCONF_REQUIRED = 2.6.1
 GCONF_SCHEMAS_INSTALL_FALSE = #
 GCONF_SCHEMAS_INSTALL_TRUE = 
-GCONF_SCHEMA_CONFIG_SOURCE = xml::/etc/gconf/gconf.xml.defaults
+GCONF_SCHEMA_CONFIG_SOURCE = xml::$(DESTDIR)/etc/gconf/gconf.xml.defaults
 GCONF_SCHEMA_FILE_DIR = $(sysconfdir)/gconf/schemas/
 GDK_PIXBUF_CSOURCE = /usr/bin/gdk-pixbuf-csource
 GDK_PIXBUF_REQUIRED = 2.1.0
@@ -811,11 +811,9 @@
 
 # don't do this if we are building in eg. rpm
 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)/applets/wncklet/$$p ; \
-		done \
-	fi
+	for p in $(schemas_DATA) ; do \
+		GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/applets/wncklet/$$p ; \
+	done
 #install-data-local:
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.