--- gnome-utils-2.4.0/logview/Makefile.orig 2004-01-14 14:40:15.000000000 -0500 +++ gnome-utils-2.4.0/logview/Makefile 2004-01-14 15:00:06.000000000 -0500 @@ -74,7 +74,7 @@ DATADIRNAME = share EXPANDED_LOGVIEWDIR = NONE/bin 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/ GETTEXT_PACKAGE = gnome-utils-2.0 GMOFILES = am.gmo ar.gmo az.gmo be.gmo bg.gmo bn.gmo ca.gmo cs.gmo cy.gmo da.gmo de.gmo el.gmo en_GB.gmo es.gmo et.gmo eu.gmo fa.gmo fi.gmo fr.gmo ga.gmo gl.gmo he.gmo hi.gmo hu.gmo id.gmo it.gmo ja.gmo ko.gmo lt.gmo lv.gmo mk.gmo ml.gmo mn.gmo ms.gmo nl.gmo nn.gmo no.gmo pl.gmo pt.gmo pt_BR.gmo ro.gmo ru.gmo sk.gmo sl.gmo sq.gmo sr.gmo sr@Latn.gmo sv.gmo ta.gmo tr.gmo uk.gmo vi.gmo wa.gmo zh_CN.gmo zh_TW.gmo @@ -571,9 +571,7 @@ %.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-gconf-schemas: - if test -z "$(DESTDIR)" ; then \ - GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schema_source_data) ; \ - fi + GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schema_source_data) ; \ install-data-local: gnome-system-log-security install-gconf-schemas --- gnome-utils-2.4.0/gsearchtool/Makefile.orig 2004-01-14 14:40:16.000000000 -0500 +++ gnome-utils-2.4.0/gsearchtool/Makefile 2004-01-14 15:00:23.000000000 -0500 @@ -72,7 +72,7 @@ DATADIRNAME = share EXPANDED_LOGVIEWDIR = NONE/bin 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/ GETTEXT_PACKAGE = gnome-utils-2.0 GMOFILES = am.gmo ar.gmo az.gmo be.gmo bg.gmo bn.gmo ca.gmo cs.gmo cy.gmo da.gmo de.gmo el.gmo en_GB.gmo es.gmo et.gmo eu.gmo fa.gmo fi.gmo fr.gmo ga.gmo gl.gmo he.gmo hi.gmo hu.gmo id.gmo it.gmo ja.gmo ko.gmo lt.gmo lv.gmo mk.gmo ml.gmo mn.gmo ms.gmo nl.gmo nn.gmo no.gmo pl.gmo pt.gmo pt_BR.gmo ro.gmo ru.gmo sk.gmo sl.gmo sq.gmo sr.gmo sr@Latn.gmo sv.gmo ta.gmo tr.gmo uk.gmo vi.gmo wa.gmo zh_CN.gmo zh_TW.gmo --- gnome-utils-2.4.0/gdictsrc/Makefile.orig 2004-01-14 14:40:18.000000000 -0500 +++ gnome-utils-2.4.0/gdictsrc/Makefile 2004-01-14 15:00:45.000000000 -0500 @@ -72,7 +72,7 @@ DATADIRNAME = share EXPANDED_LOGVIEWDIR = NONE/bin 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/ GETTEXT_PACKAGE = gnome-utils-2.0 GMOFILES = am.gmo ar.gmo az.gmo be.gmo bg.gmo bn.gmo ca.gmo cs.gmo cy.gmo da.gmo de.gmo el.gmo en_GB.gmo es.gmo et.gmo eu.gmo fa.gmo fi.gmo fr.gmo ga.gmo gl.gmo he.gmo hi.gmo hu.gmo id.gmo it.gmo ja.gmo ko.gmo lt.gmo lv.gmo mk.gmo ml.gmo mn.gmo ms.gmo nl.gmo nn.gmo no.gmo pl.gmo pt.gmo pt_BR.gmo ro.gmo ru.gmo sk.gmo sl.gmo sq.gmo sr.gmo sr@Latn.gmo sv.gmo ta.gmo tr.gmo uk.gmo vi.gmo wa.gmo zh_CN.gmo zh_TW.gmo @@ -669,9 +669,7 @@ %.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 \ - GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schema_source_data) ; \ - fi + GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schema_source_data) ; \ # 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-utils-2.4.0/gfloppy/Makefile.orig 2004-01-14 14:40:18.000000000 -0500 +++ gnome-utils-2.4.0/gfloppy/Makefile 2004-01-14 15:01:08.000000000 -0500 @@ -72,7 +72,7 @@ DATADIRNAME = share EXPANDED_LOGVIEWDIR = NONE/bin 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/ GETTEXT_PACKAGE = gnome-utils-2.0 GMOFILES = am.gmo ar.gmo az.gmo be.gmo bg.gmo bn.gmo ca.gmo cs.gmo cy.gmo da.gmo de.gmo el.gmo en_GB.gmo es.gmo et.gmo eu.gmo fa.gmo fi.gmo fr.gmo ga.gmo gl.gmo he.gmo hi.gmo hu.gmo id.gmo it.gmo ja.gmo ko.gmo lt.gmo lv.gmo mk.gmo ml.gmo mn.gmo ms.gmo nl.gmo nn.gmo no.gmo pl.gmo pt.gmo pt_BR.gmo ro.gmo ru.gmo sk.gmo sl.gmo sq.gmo sr.gmo sr@Latn.gmo sv.gmo ta.gmo tr.gmo uk.gmo vi.gmo wa.gmo zh_CN.gmo zh_TW.gmo @@ -409,9 +409,7 @@ $(INSTALL_DATA) $(srcdir)/gfloppy.mime $(DESTDIR)$(Mimedir)/ $(INSTALL_DATA) $(srcdir)/gfloppy.keys $(DESTDIR)$(Mimedir)/ - if test -z "$(DESTDIR)" ; then \ - GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schema_source_data) ; \ - fi + GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schema_source_data) ; \ dist-hook: if test -d pixmaps; then \