[gedit-latex/gnome-3-0] Move latex.plugin to the root dir

[Jose Aliste <jaliste src gnome org>]

commit d3f73a5a83be39d1ffcf24a0881443adebab1bc6
Author: Ignacio Casal Quinteiro <icq gnome org>
Date:   Mon Jun 27 23:10:33 2011 +0200

    Move latex.plugin to the root dir

 Makefile.am                                        |   15 +++++++++++++++
 configure.ac                                       |    2 +-
 ...gin.desktop.in.in => latex.plugin.desktop.in.in |    0
 latex/Makefile.am                                  |   13 +------------
 4 files changed, 17 insertions(+), 13 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 0b4c3f3..dbbccc4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,4 +27,19 @@ MAINTAINERCLEANFILES = 		\
 	py-compile		\
 	`find "$(srcdir)" -type f -name Makefile.in -print`
 
+plugindir = $(libdir)/gedit/plugins
+
+plugin_in_files = latex.plugin.desktop.in
+
+%.plugin: %.plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po)
+	$(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
+
+plugin_DATA = $(plugin_in_files:.plugin.desktop.in=.plugin)
+
+EXTRA_DIST = $(plugin_in_files)
+
+CLEANFILES = $(plugin_DATA)
+
+DISTCLEANFILES = $(plugin_DATA)
+
 -include $(top_srcdir)/git.mk
diff --git a/configure.ac b/configure.ac
index 5dfda6f..dcd803b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -73,8 +73,8 @@ AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
 
 AC_CONFIG_FILES([
 Makefile
+latex.plugin.desktop.in
 latex/gldefs.py
-latex/latex.plugin.desktop.in
 latex/Makefile
 latex/base/Makefile
 latex/bibtex/Makefile
diff --git a/latex/latex.plugin.desktop.in.in b/latex.plugin.desktop.in.in
similarity index 100%
rename from latex/latex.plugin.desktop.in.in
rename to latex.plugin.desktop.in.in
diff --git a/latex/Makefile.am b/latex/Makefile.am
index b495798..81d7ad2 100644
--- a/latex/Makefile.am
+++ b/latex/Makefile.am
@@ -1,13 +1,7 @@
 SUBDIRS = base bibtex icons latex preferences templates tools ui util
 
-plugindir = $(libdir)/gedit/plugins
 
-plugin_in_files = latex.plugin.desktop.in
 
-%.plugin: %.plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po)
-	$(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
-
-plugin_DATA = $(plugin_in_files:.plugin.desktop.in=.plugin)
 
 pluginlatexdir = $(plugindir)/latex
 
@@ -20,7 +14,7 @@ pluginlatex_PYTHON = \
 	util.py \
 	views.py
 
-pluginlatex_DATA = \
+plugin_DATA = \
 	bibtex.xml \
 	latex.xml \
 	listings.xml \
@@ -28,10 +22,5 @@ pluginlatex_DATA = \
 	symbols.xml \
 	tools.xml
 
-EXTRA_DIST = $(plugin_in_files)
-
-CLEANFILES = $(plugin_DATA)
-
-DISTCLEANFILES = $(plugin_DATA)
 
 -include $(top_srcdir)/git.mk