r20065 - gnucash/trunk/src/gnome-utils/schemas - Bug #638615: Fix schema install with DESTDIR

[Christian Stimming]

Author: cstim
Date: 2011-01-11 15:39:53 -0500 (Tue, 11 Jan 2011)
New Revision: 20065
Trac: http://svn.gnucash.org/trac/changeset/20065

Modified:
   gnucash/trunk/src/gnome-utils/schemas/Makefile.am
Log:
Bug #638615: Fix schema install with DESTDIR

Patch by Jim Radford:


When doing

  make install DESTDIR=/tmp/gnucash

the install fails because GCONF_SCHEMA_CONFIG_SOURCE doesn't end up using
DESTDIR (and it's non-trivial because of the xml:: prefix).  The attached patch
fixes it for me but is non-ideal because it hard codes the value of
GCONF_SCHEMA_CONFIG_SOURCE using GCONF_SCHEMA_CONFIG_SOURCE_DIRONLY.

Modified: gnucash/trunk/src/gnome-utils/schemas/Makefile.am
===================================================================
--- gnucash/trunk/src/gnome-utils/schemas/Makefile.am	2011-01-11 13:36:13 UTC (rev 20064)
+++ gnucash/trunk/src/gnome-utils/schemas/Makefile.am	2011-01-11 20:39:53 UTC (rev 20065)
@@ -12,10 +12,10 @@
 install-data-local:
 if GCONF_SCHEMAS_INSTALL
 	-mkdir -p $(DESTDIR)$(GCONF_SCHEMA_CONFIG_SOURCE_DIRONLY)
-	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schema_DATA)
+	GCONF_CONFIG_SOURCE=xml::$(DESTDIR)$(GCONF_SCHEMA_CONFIG_SOURCE_DIRONLY) $(GCONFTOOL) --makefile-install-rule $(schema_DATA)
 endif
 
 uninstall-local:
 if GCONF_SCHEMAS_INSTALL
-	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-uninstall-rule $(schema_DATA)
+	GCONF_CONFIG_SOURCE=xml::$(DESTDIR)$(GCONF_SCHEMA_CONFIG_SOURCE_DIRONLY) $(GCONFTOOL) --makefile-uninstall-rule $(schema_DATA)
 endif