r14929 - gnucash/branches/2.0 - Fix Makefiles for .schemas file installation.

Andreas Köhler andi5 at cvs.gnucash.org
Wed Oct 4 17:18:46 EDT 2006


Author: andi5
Date: 2006-10-04 17:18:44 -0400 (Wed, 04 Oct 2006)
New Revision: 14929
Trac: http://svn.gnucash.org/trac/changeset/14929

Modified:
   gnucash/branches/2.0/
   gnucash/branches/2.0/src/business/business-gnome/schemas/Makefile.am
   gnucash/branches/2.0/src/gnome-utils/schemas/Makefile.am
   gnucash/branches/2.0/src/gnome/schemas/Makefile.am
   gnucash/branches/2.0/src/import-export/hbci/schemas/Makefile.am
   gnucash/branches/2.0/src/import-export/schemas/Makefile.am
Log:
Fix Makefiles for .schemas file installation.
srcdir contains the .schemas.in files, but not the generated .schemas files.
Fixes make distcheck.

merged from r14925.



Property changes on: gnucash/branches/2.0
___________________________________________________________________
Name: svk:merge
   - 3889ce50-311e-0410-a464-f059747ec5d1:/local/gnucash/branches/2.0:686
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/branches/2.0:13376
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk:13282
   + 3889ce50-311e-0410-a464-f059747ec5d1:/local/gnucash/branches/2.0:688
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/branches/2.0:13376
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk:13282

Modified: gnucash/branches/2.0/src/business/business-gnome/schemas/Makefile.am
===================================================================
--- gnucash/branches/2.0/src/business/business-gnome/schemas/Makefile.am	2006-10-04 13:12:34 UTC (rev 14928)
+++ gnucash/branches/2.0/src/business/business-gnome/schemas/Makefile.am	2006-10-04 21:18:44 UTC (rev 14929)
@@ -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 $(srcdir)/$(schema_DATA)
+	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schema_DATA)
 endif
 
 uninstall-local:
 if GCONF_SCHEMAS_INSTALL
-	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-uninstall-rule $(srcdir)/$(schema_DATA)
+	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-uninstall-rule $(schema_DATA)
 endif

Modified: gnucash/branches/2.0/src/gnome/schemas/Makefile.am
===================================================================
--- gnucash/branches/2.0/src/gnome/schemas/Makefile.am	2006-10-04 13:12:34 UTC (rev 14928)
+++ gnucash/branches/2.0/src/gnome/schemas/Makefile.am	2006-10-04 21:18:44 UTC (rev 14929)
@@ -22,10 +22,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 $(srcdir)/$(schema_DATA)
+	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schema_DATA)
 endif
 
 uninstall-local:
 if GCONF_SCHEMAS_INSTALL
-	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-uninstall-rule $(srcdir)/$(schema_DATA)
+	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-uninstall-rule $(schema_DATA)
 endif

Modified: gnucash/branches/2.0/src/gnome-utils/schemas/Makefile.am
===================================================================
--- gnucash/branches/2.0/src/gnome-utils/schemas/Makefile.am	2006-10-04 13:12:34 UTC (rev 14928)
+++ gnucash/branches/2.0/src/gnome-utils/schemas/Makefile.am	2006-10-04 21:18:44 UTC (rev 14929)
@@ -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 $(srcdir)/$(schema_DATA)
+	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schema_DATA)
 endif
 
 uninstall-local:
 if GCONF_SCHEMAS_INSTALL
-	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-uninstall-rule $(srcdir)/$(schema_DATA)
+	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-uninstall-rule $(schema_DATA)
 endif

Modified: gnucash/branches/2.0/src/import-export/hbci/schemas/Makefile.am
===================================================================
--- gnucash/branches/2.0/src/import-export/hbci/schemas/Makefile.am	2006-10-04 13:12:34 UTC (rev 14928)
+++ gnucash/branches/2.0/src/import-export/hbci/schemas/Makefile.am	2006-10-04 21:18:44 UTC (rev 14929)
@@ -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 $(srcdir)/$(schema_DATA)
+	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schema_DATA)
 endif
 
 uninstall-local:
 if GCONF_SCHEMAS_INSTALL
-	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-uninstall-rule $(srcdir)/$(schema_DATA)
+	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-uninstall-rule $(schema_DATA)
 endif

Modified: gnucash/branches/2.0/src/import-export/schemas/Makefile.am
===================================================================
--- gnucash/branches/2.0/src/import-export/schemas/Makefile.am	2006-10-04 13:12:34 UTC (rev 14928)
+++ gnucash/branches/2.0/src/import-export/schemas/Makefile.am	2006-10-04 21:18:44 UTC (rev 14929)
@@ -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 $(srcdir)/$(schema_DATA)
+	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schema_DATA)
 endif
 
 uninstall-local:
 if GCONF_SCHEMAS_INSTALL
-	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-uninstall-rule $(srcdir)/$(schema_DATA)
+	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-uninstall-rule $(schema_DATA)
 endif



More information about the gnucash-changes mailing list