[anjuta-extras] bgo#590963 – Anjuta-extras make distcheck fail

[Sebastien Granjoux <sgranjoux src gnome org>]

commit 5633d6e9a33661ef89a6cef206dea88495a08a40
Author: Nicolas Bruguier <nicolas bruguier supersonicimagine fr>
Date:   Tue Aug 11 21:18:40 2009 +0200

    bgo#590963 â?? Anjuta-extras make distcheck fail

 configure.ac                                      |   14 +-
 plugins/scintilla/anjuta-editor-scintilla.schemas |  373 ---------------------
 scripts/build-schemas.mk                          |   13 +-
 3 files changed, 20 insertions(+), 380 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 3eaf936..806f9b5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -209,8 +209,18 @@ AM_CONDITIONAL(HAVE_PLUGIN_SCINTILLA, [test x$scintilla = xyes])
 
 dnl Setup Plugin directories
 dnl ------------------------
-anjutalibdir=`pkg-config --variable=libdir libanjuta-1.0`
-anjutadatadir=`pkg-config --variable=datadir libanjuta-1.0`
+
+dnl In order to pass distcheck, the script has to install the plugin
+dnl in the correct prefix if defined. This is done using the
+dnl pkg-config option --define-variable.
+if test "x$prefix" = "xNONE" ; then
+	pkg_prefix=""
+else
+	pkg_prefix="--define-variable=prefix=$prefix"
+fi
+
+anjutalibdir=`pkg-config $pkg_prefix --variable=libdir libanjuta-1.0`
+anjutadatadir=`pkg-config $pkg_prefix --variable=datadir libanjuta-1.0`
 AC_SUBST(anjutalibdir)
 AC_SUBST(anjutadatadir)
 anjuta_plugin_dir='$(anjutalibdir)/anjuta'
diff --git a/scripts/build-schemas.mk b/scripts/build-schemas.mk
index b4e33c0..6a12b14 100644
--- a/scripts/build-schemas.mk
+++ b/scripts/build-schemas.mk
@@ -5,13 +5,16 @@ prefs_ui_schemas = $(prefs_ui_files:.ui=.schemas)
 prefs_ui_schemas_DATA = $(prefs_ui_schemas)
 
 %.schemas: %.ui
-	$(top_srcdir)/scripts/builder2schema.pl $(srcdir)/$(?) > $(@)
+	$(top_srcdir)/scripts/builder2schema.pl $< > $@
 
 if GCONF_SCHEMAS_INSTALL
-uninstall-local: $(prefs_glade_schemas) $(prefs_ui_schemas)
-	        for p in $(prefs_glade_schemas) ; do \
-	            GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-uninstall-rule $$p ; \
+install-data-local: $(prefs_ui_schemas)
+	        for p in $(prefs_ui_schemas) ; do \
+	            GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $$p ; \
 	        done
+		@killall -1 gconfd-2 || true
+
+uninstall-local: $(prefs_ui_schemas)
 	        for p in $(prefs_ui_schemas) ; do \
 	            GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-uninstall-rule $$p ; \
 	        done
@@ -23,4 +26,4 @@ install-data-local:
 uninstall-local:
 endif
 
-CLEANFILES = $(prefs_glade_schemas)
+CLEANFILES = $(prefs_ui_schemas)