From 5633d6e9a33661ef89a6cef206dea88495a08a40 Mon Sep 17 00:00:00 2001 From: Nicolas Bruguier Date: Tue, 11 Aug 2009 21:18:40 +0200 Subject: [PATCH] =?utf8?q?bgo#590963=20=E2=80=93=20Anjuta-extras=20make=20?= =?utf8?q?distcheck=20fail?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- configure.ac | 14 +- plugins/scintilla/anjuta-editor-scintilla.schemas | 373 ---------------------- scripts/build-schemas.mk | 13 +- 3 files changed, 20 insertions(+), 380 deletions(-) delete mode 100644 plugins/scintilla/anjuta-editor-scintilla.schemas 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/plugins/scintilla/anjuta-editor-scintilla.schemas b/plugins/scintilla/anjuta-editor-scintilla.schemas deleted file mode 100644 index 46f57d5..0000000 --- a/plugins/scintilla/anjuta-editor-scintilla.schemas +++ /dev/null @@ -1,373 +0,0 @@ - - - - /schemas/apps/anjuta/preferences/autocomplete.choose.single - /apps/anjuta/preferences/autocomplete.choose.single - anjuta - bool - FALSE - - - - - /schemas/apps/anjuta/preferences/xml.auto.close.tags - /apps/anjuta/preferences/xml.auto.close.tags - anjuta - bool - TRUE - - - - - /schemas/apps/anjuta/preferences/autocompleteword.automatic - /apps/anjuta/preferences/autocompleteword.automatic - anjuta - int - 3 - - - - - /schemas/apps/anjuta/preferences/fold - /apps/anjuta/preferences/fold - anjuta - bool - TRUE - - - - - /schemas/apps/anjuta/preferences/fold.comment - /apps/anjuta/preferences/fold.comment - anjuta - bool - TRUE - - - - - /schemas/apps/anjuta/preferences/fold.comment.python - /apps/anjuta/preferences/fold.comment.python - anjuta - bool - TRUE - - - - - /schemas/apps/anjuta/preferences/fold.quotes.python - /apps/anjuta/preferences/fold.quotes.python - anjuta - bool - TRUE - - - - - /schemas/apps/anjuta/preferences/fold.html - /apps/anjuta/preferences/fold.html - anjuta - bool - TRUE - - - - - /schemas/apps/anjuta/preferences/fold.compact - /apps/anjuta/preferences/fold.compact - anjuta - bool - TRUE - - - - - /schemas/apps/anjuta/preferences/fold.underline - /apps/anjuta/preferences/fold.underline - anjuta - bool - TRUE - - - - - /schemas/apps/anjuta/preferences/fold.on.open - /apps/anjuta/preferences/fold.on.open - anjuta - bool - FALSE - - - - - /schemas/apps/anjuta/preferences/disable.syntax.hilighting - /apps/anjuta/preferences/disable.syntax.hilighting - anjuta - bool - FALSE - - - - - /schemas/apps/anjuta/preferences/braces.check - /apps/anjuta/preferences/braces.check - anjuta - bool - TRUE - - - - - /schemas/apps/anjuta/preferences/strip.trailing.spaces - /apps/anjuta/preferences/strip.trailing.spaces - anjuta - bool - FALSE - - - - - /schemas/apps/anjuta/preferences/editor.doseol - /apps/anjuta/preferences/editor.doseol - anjuta - bool - FALSE - - - - - /schemas/apps/anjuta/preferences/editor.wrapbookmarks - /apps/anjuta/preferences/editor.wrapbookmarks - anjuta - bool - TRUE - - - - - /schemas/apps/anjuta/preferences/edge.column - /apps/anjuta/preferences/edge.column - anjuta - int - 80 - - - - - /schemas/apps/anjuta/preferences/caret.period - /apps/anjuta/preferences/caret.period - anjuta - int - 350 - - - - - /schemas/apps/anjuta/preferences/caret.width - /apps/anjuta/preferences/caret.width - anjuta - int - 2 - - - - - /schemas/apps/anjuta/preferences/margin.linenumber.width - /apps/anjuta/preferences/margin.linenumber.width - anjuta - int - 40 - - - - - /schemas/apps/anjuta/preferences/indent.automatic - /apps/anjuta/preferences/indent.automatic - anjuta - bool - TRUE - - - - - /schemas/apps/anjuta/preferences/indent.maintain - /apps/anjuta/preferences/indent.maintain - anjuta - bool - FALSE - - - - - /schemas/apps/anjuta/preferences/tab.indents - /apps/anjuta/preferences/tab.indents - anjuta - bool - FALSE - - - - - /schemas/apps/anjuta/preferences/backspace.unindents - /apps/anjuta/preferences/backspace.unindents - anjuta - bool - FALSE - - - - - /schemas/apps/anjuta/preferences/indent.closing - /apps/anjuta/preferences/indent.closing - anjuta - bool - FALSE - - - - - /schemas/apps/anjuta/preferences/indent.opening - /apps/anjuta/preferences/indent.opening - anjuta - bool - FALSE - - - - - /schemas/apps/anjuta/preferences/use.tabs - /apps/anjuta/preferences/use.tabs - anjuta - bool - TRUE - - - - - /schemas/apps/anjuta/preferences/indent.size - /apps/anjuta/preferences/indent.size - anjuta - int - 4 - - - - - /schemas/apps/anjuta/preferences/tabsize - /apps/anjuta/preferences/tabsize - anjuta - int - 4 - - - - - /schemas/apps/anjuta/preferences/view.eol - /apps/anjuta/preferences/view.eol - anjuta - bool - FALSE - - - - - /schemas/apps/anjuta/preferences/view.indentation.guides - /apps/anjuta/preferences/view.indentation.guides - anjuta - bool - FALSE - - - - - /schemas/apps/anjuta/preferences/whitespace - /apps/anjuta/preferences/whitespace - anjuta - bool - FALSE - - - - - /schemas/apps/anjuta/preferences/view.indentation.whitespace - /apps/anjuta/preferences/view.indentation.whitespace - anjuta - bool - FALSE - - - - - /schemas/apps/anjuta/preferences/view.line.wrap - /apps/anjuta/preferences/view.line.wrap - anjuta - bool - FALSE - - - - - /schemas/apps/anjuta/preferences/margin.linenumber.visible - /apps/anjuta/preferences/margin.linenumber.visible - anjuta - bool - TRUE - - - - - /schemas/apps/anjuta/preferences/margin.marker.visible - /apps/anjuta/preferences/margin.marker.visible - anjuta - bool - TRUE - - - - - /schemas/apps/anjuta/preferences/margin.fold.visible - /apps/anjuta/preferences/margin.fold.visible - anjuta - bool - TRUE - - - - - /schemas/apps/anjuta/preferences/print.linenumber.count - /apps/anjuta/preferences/print.linenumber.count - anjuta - int - 1 - - - - - /schemas/apps/anjuta/preferences/print.linewrap - /apps/anjuta/preferences/print.linewrap - anjuta - bool - TRUE - - - - - /schemas/apps/anjuta/preferences/print.header - /apps/anjuta/preferences/print.header - anjuta - bool - TRUE - - - - - /schemas/apps/anjuta/preferences/print.color - /apps/anjuta/preferences/print.color - anjuta - bool - TRUE - - - - - 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) -- 2.11.4.GIT