gedit r6802 - in trunk: . plugins/changecase plugins/docinfo plugins/externaltools plugins/externaltools/tools plugins/filebrowser plugins/indent plugins/modelines plugins/pythonconsole plugins/pythonconsole/pythonconsole plugins/sample plugins/snippets plugins/snippets/snippets plugins/sort plugins/spell plugins/taglist plugins/time

[jessevdk svn gnome org]

Author: jessevdk
Date: Sat Jan  3 14:20:32 2009
New Revision: 6802
URL: http://svn.gnome.org/viewvc/gedit?rev=6802&view=rev

Log:
	* configure.ac:
	* plugins/spell/Makefile.am:
	* plugins/modelines/Makefile.am:
	* plugins/sample/Makefile.am:
	* plugins/indent/Makefile.am:
	* plugins/docinfo/Makefile.am:
	* plugins/changecase/Makefile.am:
	* plugins/filebrowser/Makefile.am:
	* plugins/sort/Makefile.am:
	* plugins/time/Makefile.am:
	* plugins/externaltools/tools/Makefile.am:
	* plugins/externaltools/Makefile.am:
	* plugins/pythonconsole/pythonconsole/Makefile.am:
	* plugins/pythonconsole/Makefile.am:
	* plugins/snippets/snippets/Makefile.am:
	* plugins/snippets/Makefile.am:
	* plugins/taglist/Makefile.am:
	
	Use the new GEDIT_PLUGINS_LIBS_DIR and GEDIT_PLUGINS_DATA_DIR.


Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/plugins/changecase/Makefile.am
   trunk/plugins/docinfo/Makefile.am
   trunk/plugins/externaltools/Makefile.am
   trunk/plugins/externaltools/tools/Makefile.am
   trunk/plugins/filebrowser/Makefile.am
   trunk/plugins/indent/Makefile.am
   trunk/plugins/modelines/Makefile.am
   trunk/plugins/pythonconsole/Makefile.am
   trunk/plugins/pythonconsole/pythonconsole/Makefile.am
   trunk/plugins/sample/Makefile.am
   trunk/plugins/snippets/Makefile.am
   trunk/plugins/snippets/snippets/Makefile.am
   trunk/plugins/sort/Makefile.am
   trunk/plugins/spell/Makefile.am
   trunk/plugins/taglist/Makefile.am
   trunk/plugins/time/Makefile.am

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Sat Jan  3 14:20:32 2009
@@ -381,8 +381,8 @@
 GEDIT_PLUGINS_DATA_DIR="$datadir/gedit-2/plugins"
 AC_SUBST(GEDIT_PLUGINS_DATA_DIR)
 
-GEDIT_PLUGINS_LIB_DIR="$libdir/gedit-2/plugins"
-AC_SUBST(GEDIT_PLUGINS_LIB_DIR)
+GEDIT_PLUGINS_LIBS_DIR="$libdir/gedit-2/plugins"
+AC_SUBST(GEDIT_PLUGINS_LIBS_DIR)
 
 AC_CONFIG_FILES([
 Makefile

Modified: trunk/plugins/changecase/Makefile.am
==============================================================================
--- trunk/plugins/changecase/Makefile.am	(original)
+++ trunk/plugins/changecase/Makefile.am	Sat Jan  3 14:20:32 2009
@@ -1,5 +1,5 @@
 # changecase plugin
-plugindir = $(libdir)/gedit-2/plugins
+plugindir = $(GEDIT_PLUGINS_LIBS_DIR)
 
 INCLUDES = \
 	-I$(top_srcdir) 				\
@@ -16,7 +16,7 @@
 libchangecase_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
 libchangecase_la_LIBADD = $(GEDIT_LIBS)
 
-uidir = $(datadir)/gedit-2/plugins/changecase
+uidir = $(GEDIT_PLUGINS_DATA_DIR)/changecase
 ui_DATA =
 
 plugin_in_files = changecase.gedit-plugin.desktop.in

Modified: trunk/plugins/docinfo/Makefile.am
==============================================================================
--- trunk/plugins/docinfo/Makefile.am	(original)
+++ trunk/plugins/docinfo/Makefile.am	Sat Jan  3 14:20:32 2009
@@ -1,5 +1,5 @@
 # docinfo plugin
-plugindir = $(libdir)/gedit-2/plugins
+plugindir = $(GEDIT_PLUGINS_LIBS_DIR)
 
 INCLUDES = \
 	-I$(top_srcdir) 				\
@@ -16,7 +16,7 @@
 libdocinfo_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
 libdocinfo_la_LIBADD  = $(GEDIT_LIBS)
 
-uidir = $(datadir)/gedit-2/plugins/docinfo
+uidir = $(GEDIT_PLUGINS_DATA_DIR)/docinfo
 ui_DATA = docinfo.ui
 
 plugin_in_files = docinfo.gedit-plugin.desktop.in

Modified: trunk/plugins/externaltools/Makefile.am
==============================================================================
--- trunk/plugins/externaltools/Makefile.am	(original)
+++ trunk/plugins/externaltools/Makefile.am	Sat Jan  3 14:20:32 2009
@@ -1,6 +1,6 @@
 # External Tools plugin
 SUBDIRS = tools data scripts
-plugindir = $(GEDIT_PLUGINS_LIB_DIR)
+plugindir = $(GEDIT_PLUGINS_LIBS_DIR)
 
 plugin_in_files = externaltools.gedit-plugin.desktop.in
 %.gedit-plugin: %.gedit-plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache

Modified: trunk/plugins/externaltools/tools/Makefile.am
==============================================================================
--- trunk/plugins/externaltools/tools/Makefile.am	(original)
+++ trunk/plugins/externaltools/tools/Makefile.am	Sat Jan  3 14:20:32 2009
@@ -1,6 +1,6 @@
 # Python snippets plugin
 
-plugindir = $(GEDIT_PLUGINS_LIB_DIR)/externaltools
+plugindir = $(GEDIT_PLUGINS_LIBS_DIR)/externaltools
 plugin_PYTHON =		\
 	__init__.py	\
 	capture.py	\

Modified: trunk/plugins/filebrowser/Makefile.am
==============================================================================
--- trunk/plugins/filebrowser/Makefile.am	(original)
+++ trunk/plugins/filebrowser/Makefile.am	Sat Jan  3 14:20:32 2009
@@ -1,6 +1,6 @@
 # filebrowser
 
-plugindir = $(libdir)/gedit-2/plugins
+plugindir = $(GEDIT_PLUGINS_LIBS_DIR)
 
 INCLUDES = \
 	-I$(top_srcdir) 						\
@@ -41,7 +41,7 @@
 libfilebrowser_la_LIBADD = $(GEDIT_LIBS)
 
 # UI files (if you use ui for your plugin, list those files here)
-uidir = $(datadir)/gedit-2/plugins/filebrowser
+uidir = $(GEDIT_PLUGINS_DATA_DIR)/filebrowser
 ui_DATA = gedit-file-browser-widget-ui.xml
 
 plugin_in_files = filebrowser.gedit-plugin.desktop.in

Modified: trunk/plugins/indent/Makefile.am
==============================================================================
--- trunk/plugins/indent/Makefile.am	(original)
+++ trunk/plugins/indent/Makefile.am	Sat Jan  3 14:20:32 2009
@@ -1,5 +1,5 @@
 # indent plugin
-plugindir = $(libdir)/gedit-2/plugins
+plugindir = $(GEDIT_PLUGINS_LIBS_DIR)
 
 INCLUDES = \
 	-I$(top_srcdir) 				\
@@ -16,7 +16,7 @@
 libindent_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
 libindent_la_LIBADD  = $(GEDIT_LIBS)
 
-uidir = $(datadir)/gedit-2/plugins/indent
+uidir = $(GEDIT_PLUGINS_DATA_DIR)/indent
 ui_DATA =
 
 plugin_in_files = indent.gedit-plugin.desktop.in

Modified: trunk/plugins/modelines/Makefile.am
==============================================================================
--- trunk/plugins/modelines/Makefile.am	(original)
+++ trunk/plugins/modelines/Makefile.am	Sat Jan  3 14:20:32 2009
@@ -1,5 +1,5 @@
 # Modelines Plugin
-plugindir = $(libdir)/gedit-2/plugins
+plugindir = $(GEDIT_PLUGINS_LIBS_DIR)
 
 INCLUDES = \
 	-I$(top_srcdir) 				\
@@ -7,7 +7,7 @@
 	$(WARN_CFLAGS)					\
 	$(DISABLE_DEPRECATED_CFLAGS)
 
-modelinesdir = $(datadir)/gedit-2/plugins/modelines
+modelinesdir = $(GEDIT_PLUGINS_DATA_DIR)/modelines
 modelines_DATA = \
 	language-mappings
 

Modified: trunk/plugins/pythonconsole/Makefile.am
==============================================================================
--- trunk/plugins/pythonconsole/Makefile.am	(original)
+++ trunk/plugins/pythonconsole/Makefile.am	Sat Jan  3 14:20:32 2009
@@ -1,6 +1,6 @@
 # Python Console Plugin
 SUBDIRS = pythonconsole
-plugindir = $(libdir)/gedit-2/plugins
+plugindir = $(GEDIT_PLUGINS_LIBS_DIR)
 
 plugin_in_files = pythonconsole.gedit-plugin.desktop.in
 %.gedit-plugin: %.gedit-plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache

Modified: trunk/plugins/pythonconsole/pythonconsole/Makefile.am
==============================================================================
--- trunk/plugins/pythonconsole/pythonconsole/Makefile.am	(original)
+++ trunk/plugins/pythonconsole/pythonconsole/Makefile.am	Sat Jan  3 14:20:32 2009
@@ -4,7 +4,7 @@
 	__init__.py	\
 	console.py
 
-plugindir = $(libdir)/gedit-2/plugins/pythonconsole
+plugindir = $(GEDIT_PLUGINS_LIBS_DIR)/pythonconsole
 
 CLEANFILES =
 DISTCLEANFILES =

Modified: trunk/plugins/sample/Makefile.am
==============================================================================
--- trunk/plugins/sample/Makefile.am	(original)
+++ trunk/plugins/sample/Makefile.am	Sat Jan  3 14:20:32 2009
@@ -1,5 +1,5 @@
 # Sample plugin
-plugindir = $(libdir)/gedit-2/plugins
+plugindir = $(GEDIT_PLUGINS_LIBS_DIR)
 
 INCLUDES = \
 	-I$(top_srcdir) 				\
@@ -16,7 +16,7 @@
 libsample_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
 libsample_la_LIBADD  = $(GEDIT_LIBS)
 
-uidir = $(datadir)/gedit-2/plugins/sample
+uidir = $(GEDIT_PLUGINS_DATA_DIR)/sample
 ui_DATA =
 
 plugin_in_files = sample.gedit-plugin.desktop.in

Modified: trunk/plugins/snippets/Makefile.am
==============================================================================
--- trunk/plugins/snippets/Makefile.am	(original)
+++ trunk/plugins/snippets/Makefile.am	Sat Jan  3 14:20:32 2009
@@ -1,6 +1,6 @@
 # Python snippets plugin
 SUBDIRS = snippets data
-plugindir = $(GEDIT_PLUGINS_LIB_DIR)
+plugindir = $(GEDIT_PLUGINS_LIBS_DIR)
 
 plugin_in_files = snippets.gedit-plugin.desktop.in
 %.gedit-plugin: %.gedit-plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache

Modified: trunk/plugins/snippets/snippets/Makefile.am
==============================================================================
--- trunk/plugins/snippets/snippets/Makefile.am	(original)
+++ trunk/plugins/snippets/snippets/Makefile.am	Sat Jan  3 14:20:32 2009
@@ -1,5 +1,5 @@
 # Python snippets plugin
-plugindir = $(GEDIT_PLUGINS_LIB_DIR)/snippets
+plugindir = $(GEDIT_PLUGINS_LIBS_DIR)/snippets
 
 plugin_PYTHON = \
 	__init__.py \

Modified: trunk/plugins/sort/Makefile.am
==============================================================================
--- trunk/plugins/sort/Makefile.am	(original)
+++ trunk/plugins/sort/Makefile.am	Sat Jan  3 14:20:32 2009
@@ -1,5 +1,5 @@
 # sort plugin
-plugindir = $(libdir)/gedit-2/plugins
+plugindir = $(GEDIT_PLUGINS_LIBS_DIR)
 
 INCLUDES = \
 	-I$(top_srcdir) 				\
@@ -16,7 +16,7 @@
 libsort_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
 libsort_la_LIBADD  = $(GEDIT_LIBS)
 
-uidir = $(datadir)/gedit-2/plugins/sort
+uidir = $(GEDIT_PLUGINS_DATA_DIR)/sort
 ui_DATA = sort.ui
 
 plugin_in_files = sort.gedit-plugin.desktop.in

Modified: trunk/plugins/spell/Makefile.am
==============================================================================
--- trunk/plugins/spell/Makefile.am	(original)
+++ trunk/plugins/spell/Makefile.am	Sat Jan  3 14:20:32 2009
@@ -1,5 +1,5 @@
 # Spell checker plugin
-plugindir = $(libdir)/gedit-2/plugins
+plugindir = $(GEDIT_PLUGINS_LIBS_DIR)
 
 BUILT_SOURCES = 						\
 	gedit-spell-checker-dialog-marshal.c			\
@@ -33,7 +33,7 @@
 libspell_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS) 
 libspell_la_LIBADD  = $(GEDIT_LIBS) $(ENCHANT_LIBS)
 
-uidir = $(datadir)/gedit-2/plugins/spell
+uidir = $(GEDIT_PLUGINS_DATA_DIR)/spell
 ui_DATA = spell-checker.ui languages-dialog.ui
 
 gedit-spell-checker-dialog-marshal.h: gedit-spell-checker-dialog-marshal.list $(GLIB_GENMARSHAL)

Modified: trunk/plugins/taglist/Makefile.am
==============================================================================
--- trunk/plugins/taglist/Makefile.am	(original)
+++ trunk/plugins/taglist/Makefile.am	Sat Jan  3 14:20:32 2009
@@ -1,7 +1,7 @@
 # Tag list plugin
-plugindir = $(libdir)/gedit-2/plugins
+plugindir = $(GEDIT_PLUGINS_LIBS_DIR)
 
-taglistdir = $(datadir)/gedit-2/plugins/taglist
+taglistdir = $(GEDIT_PLUGINS_DATA_DIR)/taglist
 
 taglist_in_files = \
 	HTML.tags.xml.in	\

Modified: trunk/plugins/time/Makefile.am
==============================================================================
--- trunk/plugins/time/Makefile.am	(original)
+++ trunk/plugins/time/Makefile.am	Sat Jan  3 14:20:32 2009
@@ -1,5 +1,5 @@
 # time plugin
-plugindir = $(libdir)/gedit-2/plugins
+plugindir = $(GEDIT_PLUGINS_LIBS_DIR)
 
 INCLUDES = \
 	-I$(top_srcdir) 				\
@@ -16,7 +16,7 @@
 libtime_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
 libtime_la_LIBADD  = $(GEDIT_LIBS)
 
-uidir = $(datadir)/gedit-2/plugins/time
+uidir = $(GEDIT_PLUGINS_DATA_DIR)
 ui_DATA = time.ui
 
 plugin_in_files = time.gedit-plugin.desktop.in