gnome-utils r8336 - in trunk/logview: . data

[cosimoc svn gnome org]

Author: cosimoc
Date: Tue Dec 23 13:28:49 2008
New Revision: 8336
URL: http://svn.gnome.org/viewvc/gnome-utils?rev=8336&view=rev

Log:
Modify Makefile.am files to handle schemas in data dir.

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

Modified: trunk/logview/Makefile.am
==============================================================================
--- trunk/logview/Makefile.am	(original)
+++ trunk/logview/Makefile.am	Tue Dec 23 13:28:49 2008
@@ -1,5 +1,3 @@
-# Process this file with automake to produce Makefile.in
-
 SUBDIRS = data help tests
 
 INCLUDES = \
@@ -50,26 +48,7 @@
 	echo "#include \"logview-marshal.h\"" > $@ && \
 	$(GLIB_GENMARSHAL) $< --body --prefix=logview_marshal >> $@
 
-schemasdir   = $(GCONF_SCHEMA_FILE_DIR)
-schemas_in_file = logview.schemas.in
-schemas_DATA = $(schemas_in_file:.schemas.in=.schemas)
- INTLTOOL_SCHEMAS_RULE@
-
-if GCONF_SCHEMAS_INSTALL
-install-gconf-schemas:
-	if test -z "$(DESTDIR)" ; then \
-		for p in $(schemas_DATA) ; do \
-			GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/logview/$$p ; \
-		done \
-	fi
-else
-install-gconf-schemas:
-endif
-
-install-data-local: install-gconf-schemas
-
 CLEANFILES = 				\
-	logview.schemas			\
 	$(BUILT_SOURCES)
 
 dist-hook:

Modified: trunk/logview/data/Makefile.am
==============================================================================
--- trunk/logview/data/Makefile.am	(original)
+++ trunk/logview/data/Makefile.am	Tue Dec 23 13:28:49 2008
@@ -8,10 +8,26 @@
 
 man_MANS = gnome-system-log.1
 
+schemasdir = $(GCONF_SCHEMA_FILE_DIR)
+schemas_in_files = gnome-system-log.schemas.in
+schemas_DATA = $(schemas_in_file:.schemas.in=.schemas)
+ INTLTOOL_SCHEMAS_RULE@
+
+install-gconf-schemas: $(schemas_DATA)
+if GCONF_SCHEMAS_INSTALL
+	if test -z "$(DESTDIR)" ; then \
+		for p in $^ ; do \
+			GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $$p 2>&1 > /dev/null; \
+		done \
+	fi
+endif
+
 EXTRA_DIST = 			\
 	$(xml_DATA)		\
 	$(desktop_in_files)	\
-	$(man_MANS)
+	$(man_MANS)		\
+	$(schemas_in_files)
 
 DISTCLEANFILES =		\
-	$(desktop_DATA)
+	$(desktop_DATA)		\
+	$(schemas_DATA)