devhelp r1189 - in trunk: . data

[rhult svn gnome org]

Author: rhult
Date: Fri Oct 10 14:05:14 2008
New Revision: 1189
URL: http://svn.gnome.org/viewvc/devhelp?rev=1189&view=rev

Log:
2008-10-10  Richard Hult  <richard imendio com>

	* data/Makefile.am: Install gconf schemas in file so ige-conf can
	use it for defaults handling when using NSUserDefaults.


Modified:
   trunk/ChangeLog
   trunk/data/Makefile.am

Modified: trunk/data/Makefile.am
==============================================================================
--- trunk/data/Makefile.am	(original)
+++ trunk/data/Makefile.am	Fri Oct 10 14:05:14 2008
@@ -10,21 +10,23 @@
 
 @INTLTOOL_DESKTOP_RULE@
 
-DESKTOP_IN_FILES = devhelp.desktop.in
-DESKTOP_FILES =$(DESKTOP_IN_FILES:.desktop.in=.desktop)
-
 desktopdir = $(datadir)/applications
-desktop_DATA = $(DESKTOP_FILES)
+desktop_in_files = devhelp.desktop.in
+desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 
-schemasdir       = $(GCONF_SCHEMA_FILE_DIR)
+schemasdir = $(GCONF_SCHEMA_FILE_DIR)
 schemas_in_files = devhelp.schemas.in
-schemas_DATA     = $(schemas_in_files:.schemas.in=.schemas)
+schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
 @INTLTOOL_SCHEMAS_RULE@
 
+defaultsdir = $(datadir)/devhelp
+defaults_DATA = devhelp.defaults
+devhelp.defaults: devhelp.schemas.in
+	cp $(srcdir)/devhelp.schemas.in $(builddir)/devhelp.defaults
+
 EXTRA_DIST =			\
 	libdevhelp-1.0.pc.in    \
-	$(DESKTOP_IN_FILES)	\
-	$(DESKTOP_FILES)        \
+	$(desktop_in_files)	\
 	$(schemas_in_files)     \
 	$(schemas_DATA)		\
 	$(assistant_DATA)
@@ -38,7 +40,10 @@
 	fi
 endif
 
-CLEANFILES = $(DESKTOP_FILES)
-
-DISTCLEANFILES = $(DESKTOP_FILES)  \
-		 $(schemas_DATA)
+CLEANFILES =			\
+	$(DESKTOP_FILES)	\
+	$(defaults_DATA)
+
+DISTCLEANFILES =		\
+	$(desktop_DATA)		\
+	$(schemas_DATA)