--- control-center-2.6.1/schemas/Makefile.orig 2004-05-11 19:56:45.000000000 -0400 +++ control-center-2.6.1/schemas/Makefile 2004-05-11 19:56:47.000000000 -0400 @@ -102,7 +102,7 @@ GCJFLAGS = @GCJFLAGS@ GCONFTOOL = /usr/bin/gconftool-2 GCONF_CONFIG_SOURCE = xml::${DESTDIR}${sysconfdir}/gconf/gconf.xml.defaults -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 = control-center-2.0 @@ -327,11 +327,9 @@ # 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; \ - done \ - fi + for p in $(schema_DATA) ; do \ + GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$$p; \ + done #install-data-local: # Tell versions [3.59,3.63) of GNU make to not export all variables. --- control-center-2.6.1/vfs-methods/fontilus/Makefile.orig 2004-05-11 19:56:46.000000000 -0400 +++ control-center-2.6.1/vfs-methods/fontilus/Makefile 2004-05-11 20:00:19.000000000 -0400 @@ -102,7 +102,7 @@ GCJFLAGS = @GCJFLAGS@ GCONFTOOL = /usr/bin/gconftool-2 GCONF_CONFIG_SOURCE = xml::${DESTDIR}${sysconfdir}/gconf/gconf.xml.defaults -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 = control-center-2.0 @@ -698,9 +698,7 @@ sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" $< > $@ install-data-local: - if test -z "$(DESTDIR)"; then \ - GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/fontilus.schemas; \ - fi + GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/fontilus.schemas; \ #install-data-local: %.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache --- control-center-2.6.1/vfs-methods/themus/Makefile.orig 2004-05-11 19:56:46.000000000 -0400 +++ control-center-2.6.1/vfs-methods/themus/Makefile 2004-05-11 19:59:48.000000000 -0400 @@ -102,7 +102,7 @@ GCJFLAGS = @GCJFLAGS@ GCONFTOOL = /usr/bin/gconftool-2 GCONF_CONFIG_SOURCE = xml::${DESTDIR}${sysconfdir}/gconf/gconf.xml.defaults -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 = control-center-2.0 @@ -755,9 +755,7 @@ sed -e "s|\@BONOBODIR\@|$(bonobodir)|" $< > $@ install-data-local: - if test -z "$(DESTDIR)"; then \ - GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/themus.schemas; \ - fi + GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/themus.schemas; \ #install-data-local: %.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -k -u -c $(top_builddir)/po/.intltool-merge-cache