--- control-center-2.4.0/schemas/Makefile.orig 2004-01-15 15:12:14.000000000 -0500 +++ control-center-2.4.0/schemas/Makefile 2004-01-15 15:14:05.000000000 -0500 @@ -100,7 +100,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 @@ -315,11 +315,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.4.0/vfs-methods/fontilus/Makefile.orig 2004-01-15 15:15:43.000000000 -0500 +++ control-center-2.4.0/vfs-methods/fontilus/Makefile 2004-01-15 15:37:15.000000000 -0500 @@ -100,7 +100,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 @@ -692,9 +692,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 fontilus.schemas; \ - fi + GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule fontilus.schemas; \ %.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 %.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 --- control-center-2.4.0/vfs-methods/themus/Makefile.orig 2004-01-15 15:38:52.000000000 -0500 +++ control-center-2.4.0/vfs-methods/themus/Makefile 2004-01-20 12:34:14.000000000 -0500 @@ -100,7 +100,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 @@ -771,9 +771,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 themus.schemas; \ - fi + GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule themus.schemas; \ %.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 %.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -o -u -c $(top_builddir)/po/.intltool-merge-cache