[nautilus-actions] Fix make distcheck

[Pierre Wieser <pwieser src gnome org>]

commit b40833998c1c73a870d5d52befe90e90cd6b039d
Author: Pierre Wieser <pwieser trychlos org>
Date:   Wed Aug 5 11:38:36 2009 +0200

    Fix make distcheck

 ChangeLog            |    4 ++++
 Makefile.am          |   11 +++++++++--
 NEWS                 |    6 ++++--
 data/Makefile.am     |   31 +++++++++++++++++++++++++------
 doc/Makefile.am      |    6 +++---
 po/POTFILES.in       |    1 +
 src/nact/Makefile.am |   27 +++++++++++++--------------
 7 files changed, 59 insertions(+), 27 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index b357fff..2dfbb3c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,10 @@
 	* configure.ac:
 	* Makefile.am: Updated accordingly.
 
+	* Makefile.am:
+	* src/nact/Makefile.am:
+	Remove nautilus-actions subdirectories at uninstall time.
+
 	* src/common/na-xml-writer.c:
 	Fix schemas generation (long description tag).
 
diff --git a/Makefile.am b/Makefile.am
index d5400b6..b6d4092 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -42,6 +42,10 @@ SUBDIRS = \
 DISTCHECK_CONFIGURE_FLAGS = \
 	--with-nautilus-extdir='$${libdir}/nautilus/extensions-2.0-distcheck'
 
+# do not try to install schemas when making distcheck
+DISTCHECK_CONFIGURE_FLAGS += \
+	--disable-schemas-install
+
 EXTRA_DIST = \
 	intltool-extract.in			\
 	intltool-merge.in			\
@@ -54,9 +58,9 @@ DISTCLEANFILES = \
 	intltool-update				\
 	$(NULL)
 
-docdir = $(datarootdir)/doc/@PACKAGE -@VERSION@
+pkgdocdir = $(datarootdir)/doc/@PACKAGE -@VERSION@
 
-dist_doc_DATA = \
+dist_pkgdoc_DATA = \
 	AUTHORS						\
 	ChangeLog					\
 	ChangeLog-2008				\
@@ -67,3 +71,6 @@ dist_doc_DATA = \
 	README						\
 	TODO						\
 	$(NULL)
+
+uninstall-hook:
+	-\rm -fr $(DESTDIR)$(pkgdocdir)
diff --git a/NEWS b/NEWS
index 619e015..428ad02 100644
--- a/NEWS
+++ b/NEWS
@@ -7,8 +7,10 @@ Version 1.11.3
 
     Various code enhancements
 
-        Do not install schemas if --disable-schemas-install option has
-        been specified.
+        Do not install GConf schemas if --disable-schemas-install option
+        has been specified.
+
+        Remove nautilus-actions subdirectories at uninstall time.
  
 Version 1.11.2
 ==============
diff --git a/data/Makefile.am b/data/Makefile.am
index e7a945e..0905290 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -26,13 +26,13 @@
 #   Pierre Wieser <pwieser trychlos org>
 #   ... and many others (see AUTHORS)
 
-schema_in_files = nautilus-actions.schemas.in
+schemas_in_files = nautilus-actions.schemas.in
 
-noinst_schemadir = $(GCONF_SCHEMA_FILE_DIR)
+schemas_files = $(schemas_in_files:.schemas.in=.schemas)
 
-#schema_DATA = $(schema_in_files:.schemas.in=.schemas)
+schemasdir = $(pkgdatadir)
 
-noinst_schema_DATA = $(schema_in_files:.schemas.in=.schemas)
+schemas_DATA = $(schemas_files)
 
 @INTLTOOL_SCHEMAS_RULE@
 
@@ -42,9 +42,28 @@ else
 NA_INSTALL_SCHEMAS = no
 endif
 
-install-data-am:
+EXTRA_DIST = \
+	$(schemas_in_files)						\
+	$(NULL)
+
+install-data-hook:
 	@if test "$(NA_INSTALL_SCHEMAS)" = "yes"; then \
-		for p in $(noinst_schema_DATA); do \
+		if test `id -u` != 0; then \
+			echo "***"; \
+			echo "*** You need to be root to install GConf schemas"; \
+			echo "***"; \
+			exit 1; \
+		fi; \
+		for p in $(schemas_DATA); do \
 			GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $$p; \
 		done \
 	fi
+
+CLEANFILES = $(schemas_files)
+
+uninstall-hook:
+	@if test "$(NA_INSTALL_SCHEMAS)" = "yes"; then \
+		for p in $(schemas_DATA); do \
+			GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-uninstall-rule $$p; \
+		done \
+	fi
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 366c83a..ee5df70 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -26,8 +26,8 @@
 #   Pierre Wieser <pwieser trychlos org>
 #   ... and many others (see AUTHORS)
 
-docdir = $(datarootdir)/doc/@PACKAGE -@VERSION@
+pkgdocdir = $(datarootdir)/doc/@PACKAGE -@VERSION@
 
-dist_doc_DATA = \
-        objects-hierarchy.odg			\
+dist_pkgdoc_DATA = \
+	objects-hierarchy.odg			\
 	$(NULL)
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 474dc58..9480e2b 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,3 +1,4 @@
+data/nautilus-actions.schemas.in
 src/common/na-action.h
 src/common/na-iio-provider.c
 src/common/na-xml-names.h
diff --git a/src/nact/Makefile.am b/src/nact/Makefile.am
index b6e0990..72d6e3d 100644
--- a/src/nact/Makefile.am
+++ b/src/nact/Makefile.am
@@ -30,12 +30,10 @@ bin_PROGRAMS = \
 	nautilus-actions-config-tool						\
 	$(NULL)
 
-gladedir = $(datadir)/nautilus-actions
-
 AM_CPPFLAGS += \
 	-I $(top_srcdir)/src								\
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"			\
-	-DGLADEDIR=\"$(gladedir)\"							\
+	-DGLADEDIR=\"$(pkgdatadir)\"						\
 	-DG_LOG_DOMAIN=\"${NA_LOGDOMAIN_NACT}\"				\
 	$(NAUTILUS_ACTIONS_CFLAGS)							\
 	$(NULL)
@@ -83,24 +81,25 @@ nautilus_actions_config_tool_LDADD = \
 	$(NAUTILUS_ACTIONS_LIBS)							\
 	$(NULL)
 
-glade_DATA = nautilus-actions-config-tool.ui
+pkgdata_DATA = nautilus-actions-config-tool.ui
 
 @INTLTOOL_DESKTOP_RULE@
 
-Applications_in_files = nact.desktop.in
-
-Applications_files = $(Applications_in_files:.desktop.in=.desktop)
+applications_in_files = nact.desktop.in
 
-Applicationsdir = $(datadir)/applications
+applications_files = $(applications_in_files:.desktop.in=.desktop)
 
-schemedir = $(datadir)/applications
+applicationsdir = $(datadir)/applications
 
-scheme_DATA = $(Applications_files)
+applications_DATA = $(applications_files)
 
-DISTCLEANFILES = \
-	$(Applications_files)
+CLEANFILES = \
+	$(applications_files)
 
 EXTRA_DIST = \
-	$(Applications_in_files)							\
-	$(glade_DATA)										\
+	$(applications_in_files)							\
+	$(pkgdata_DATA)										\
 	$(NULL)
+
+uninstall-hook:
+	-\rm -fr $(DESTDIR)$(pkgdatadir)