--- gnome-applets-2.4.1/mailcheck/Makefile.orig 2004-04-03 23:43:29.000000000 -0500 +++ gnome-applets-2.4.1/mailcheck/Makefile 2004-04-03 23:48:55.000000000 -0500 @@ -82,7 +82,7 @@ GCJ = @GCJ@ GCJFLAGS = @GCJFLAGS@ GCONFTOOL = /usr/bin/gconftool-2 -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 GETTEXT_PACKAGE = gnome-applets-2.0 @@ -658,11 +658,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)/mailcheck/$$p ; \ - done \ - fi + for p in $(schemas_DATA) ; do \ + GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/mailcheck/$$p ; \ + done \ #install-data-local: # Tell versions [3.59,3.63) of GNU make to not export all variables. --- gnome-applets-2.4.1/mixer/Makefile.orig 2004-04-03 23:43:34.000000000 -0500 +++ gnome-applets-2.4.1/mixer/Makefile 2004-04-03 23:49:16.000000000 -0500 @@ -82,7 +82,7 @@ GCJ = @GCJ@ GCJFLAGS = @GCJFLAGS@ GCONFTOOL = /usr/bin/gconftool-2 -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 GETTEXT_PACKAGE = gnome-applets-2.0 --- gnome-applets-2.4.1/modemlights/Makefile.orig 2004-04-03 23:43:37.000000000 -0500 +++ gnome-applets-2.4.1/modemlights/Makefile 2004-04-03 23:49:29.000000000 -0500 @@ -82,7 +82,7 @@ GCJ = @GCJ@ GCJFLAGS = @GCJFLAGS@ GCONFTOOL = /usr/bin/gconftool-2 -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 GETTEXT_PACKAGE = gnome-applets-2.0 --- gnome-applets-2.4.1/cdplayer/Makefile.orig 2004-04-03 23:43:37.000000000 -0500 +++ gnome-applets-2.4.1/cdplayer/Makefile 2004-04-03 23:49:43.000000000 -0500 @@ -82,7 +82,7 @@ GCJ = @GCJ@ GCJFLAGS = @GCJFLAGS@ GCONFTOOL = /usr/bin/gconftool-2 -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 GETTEXT_PACKAGE = gnome-applets-2.0 --- gnome-applets-2.4.1/drivemount/Makefile.orig 2004-04-03 23:43:36.000000000 -0500 +++ gnome-applets-2.4.1/drivemount/Makefile 2004-04-03 23:49:54.000000000 -0500 @@ -82,7 +82,7 @@ GCJ = @GCJ@ GCJFLAGS = @GCJFLAGS@ GCONFTOOL = /usr/bin/gconftool-2 -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 GETTEXT_PACKAGE = gnome-applets-2.0 --- gnome-applets-2.4.1/charpick/Makefile.orig 2004-04-03 23:43:43.000000000 -0500 +++ gnome-applets-2.4.1/charpick/Makefile 2004-04-03 23:50:06.000000000 -0500 @@ -82,7 +82,7 @@ GCJ = @GCJ@ GCJFLAGS = @GCJFLAGS@ GCONFTOOL = /usr/bin/gconftool-2 -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 GETTEXT_PACKAGE = gnome-applets-2.0 --- gnome-applets-2.4.1/geyes/Makefile.orig 2004-04-03 23:43:51.000000000 -0500 +++ gnome-applets-2.4.1/geyes/Makefile 2004-04-03 23:50:18.000000000 -0500 @@ -82,7 +82,7 @@ GCJ = @GCJ@ GCJFLAGS = @GCJFLAGS@ GCONFTOOL = /usr/bin/gconftool-2 -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 GETTEXT_PACKAGE = gnome-applets-2.0 --- gnome-applets-2.4.1/mini-commander/src/Makefile.orig 2004-04-03 23:43:31.000000000 -0500 +++ gnome-applets-2.4.1/mini-commander/src/Makefile 2004-04-03 23:50:32.000000000 -0500 @@ -82,7 +82,7 @@ GCJ = @GCJ@ GCJFLAGS = @GCJFLAGS@ GCONFTOOL = /usr/bin/gconftool-2 -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 GETTEXT_PACKAGE = gnome-applets-2.0 --- gnome-applets-2.4.1/gkb-new/Makefile.orig 2004-04-03 23:43:40.000000000 -0500 +++ gnome-applets-2.4.1/gkb-new/Makefile 2004-04-03 23:50:43.000000000 -0500 @@ -82,7 +82,7 @@ GCJ = @GCJ@ GCJFLAGS = @GCJFLAGS@ GCONFTOOL = /usr/bin/gconftool-2 -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 GETTEXT_PACKAGE = gnome-applets-2.0 --- gnome-applets-2.4.1/battstat/Makefile.orig 2004-04-03 23:43:53.000000000 -0500 +++ gnome-applets-2.4.1/battstat/Makefile 2004-04-03 23:50:53.000000000 -0500 @@ -82,7 +82,7 @@ GCJ = @GCJ@ GCJFLAGS = @GCJFLAGS@ GCONFTOOL = /usr/bin/gconftool-2 -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 GETTEXT_PACKAGE = gnome-applets-2.0 --- gnome-applets-2.4.1/multiload/Makefile.orig 2004-04-03 23:43:40.000000000 -0500 +++ gnome-applets-2.4.1/multiload/Makefile 2004-04-03 23:51:02.000000000 -0500 @@ -82,7 +82,7 @@ GCJ = @GCJ@ GCJFLAGS = @GCJFLAGS@ GCONFTOOL = /usr/bin/gconftool-2 -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 GETTEXT_PACKAGE = gnome-applets-2.0 --- gnome-applets-2.4.1/gtik/Makefile.orig 2004-04-03 23:43:45.000000000 -0500 +++ gnome-applets-2.4.1/gtik/Makefile 2004-04-03 23:51:14.000000000 -0500 @@ -82,7 +82,7 @@ GCJ = @GCJ@ GCJFLAGS = @GCJFLAGS@ GCONFTOOL = /usr/bin/gconftool-2 -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 GETTEXT_PACKAGE = gnome-applets-2.0 --- gnome-applets-2.4.1/gweather/Makefile.orig 2004-04-03 23:43:48.000000000 -0500 +++ gnome-applets-2.4.1/gweather/Makefile 2004-04-03 23:51:26.000000000 -0500 @@ -82,7 +82,7 @@ GCJ = @GCJ@ GCJFLAGS = @GCJFLAGS@ GCONFTOOL = /usr/bin/gconftool-2 -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 GETTEXT_PACKAGE = gnome-applets-2.0 --- gnome-applets-2.4.1/stickynotes/Makefile.orig 2004-04-03 23:43:55.000000000 -0500 +++ gnome-applets-2.4.1/stickynotes/Makefile 2004-04-03 23:51:38.000000000 -0500 @@ -82,7 +82,7 @@ GCJ = @GCJ@ GCJFLAGS = @GCJFLAGS@ GCONFTOOL = /usr/bin/gconftool-2 -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 GETTEXT_PACKAGE = gnome-applets-2.0