[Gnucash-changes] Do all schema installs into ${prefix}/etc/gconf, not /etc/gconf.

[David Hampton]

Log Message:
-----------
Do all schema installs into ${prefix}/etc/gconf, not /etc/gconf.  Make
sure this directory exists before installing.

Tags:
----
gnucash-gnome2-dev

Modified Files:
--------------
    gnucash:
        configure.in
    gnucash/src/app-file/schemas:
        Makefile.am
    gnucash/src/business/business-gnome/schemas:
        Makefile.am
    gnucash/src/gnome/schemas:
        Makefile.am

Revision Data
-------------
Index: configure.in
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/configure.in,v
retrieving revision 1.359.2.53
retrieving revision 1.359.2.54
diff -Lconfigure.in -Lconfigure.in -u -r1.359.2.53 -r1.359.2.54
--- configure.in
+++ configure.in
@@ -38,6 +38,15 @@
 
 AM_GCONF_SOURCE_2
 
+# Override gconf default install locations.  The default is to always
+# put them into /etc.  This change puts them into $(prefix)/etc.
+if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
+  GCONF_SCHEMA_CONFIG_SOURCE="xml::${sysconfdir}/gconf/gconf.xml.defaults"
+fi
+GCONF_SCHEMA_CONFIG_SOURCE_DIRONLY=`echo $GCONF_SCHEMA_CONFIG_SOURCE | cut -d ':' -f 3`
+AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE_DIRONLY)
+
+
 # Comment out for production or semi-production builds.  I.E. Anything
 # that is explicitly tagged in cvs as a version.
 AC_DEFINE(GNUCASH_CVS,1,[Define if built from untagged cvs])
Index: Makefile.am
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/app-file/schemas/Attic/Makefile.am,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -Lsrc/app-file/schemas/Makefile.am -Lsrc/app-file/schemas/Makefile.am -u -r1.1.2.1 -r1.1.2.2
--- src/app-file/schemas/Makefile.am
+++ src/app-file/schemas/Makefile.am
@@ -4,6 +4,7 @@
 
 install-data-local:
 if GCONF_SCHEMAS_INSTALL
+	-mkdir -p $(GCONF_SCHEMA_CONFIG_SOURCE_DIRONLY)
 	-GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) gconftool-2 --makefile-install-rule $(srcdir)/$(schema_DATA)
 endif
 
Index: Makefile.am
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/business/business-gnome/schemas/Attic/Makefile.am,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -Lsrc/business/business-gnome/schemas/Makefile.am -Lsrc/business/business-gnome/schemas/Makefile.am -u -r1.1.2.1 -r1.1.2.2
--- src/business/business-gnome/schemas/Makefile.am
+++ src/business/business-gnome/schemas/Makefile.am
@@ -4,6 +4,7 @@
 
 install-data-local:
 if GCONF_SCHEMAS_INSTALL
+	-mkdir -p $(GCONF_SCHEMA_CONFIG_SOURCE_DIRONLY)
 	-GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) gconftool-2 --makefile-install-rule $(srcdir)/$(schema_DATA)
 endif
 
Index: Makefile.am
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome/schemas/Attic/Makefile.am,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -Lsrc/gnome/schemas/Makefile.am -Lsrc/gnome/schemas/Makefile.am -u -r1.1.2.6 -r1.1.2.7
--- src/gnome/schemas/Makefile.am
+++ src/gnome/schemas/Makefile.am
@@ -9,6 +9,7 @@
 
 install-data-local:
 if GCONF_SCHEMAS_INSTALL
+	-mkdir -p $(GCONF_SCHEMA_CONFIG_SOURCE_DIRONLY)
 	-GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) gconftool-2 --makefile-install-rule $(srcdir)/$(schema_DATA)
 endif