anjuta r3450 - in trunk: . libanjuta plugins/sourceview

[naba svn gnome org]

Author: naba
Date: Thu Jan 10 23:24:36 2008
New Revision: 3450
URL: http://svn.gnome.org/viewvc/anjuta?rev=3450&view=rev

Log:
	* libanjuta/Makefile.am: Install glade3 files in own prefix to
	prevent install errors when not installed as root (then the files
	are only useful when glade-3 is installed in the same prefix, but it
	doesn\'t harm anjuta runtime).

	* plugins/sourceview/sourceview.c: Commented use of a file
	not currently distributed.


Modified:
   trunk/ChangeLog
   trunk/libanjuta/Makefile.am
   trunk/plugins/sourceview/sourceview.c

Modified: trunk/libanjuta/Makefile.am
==============================================================================
--- trunk/libanjuta/Makefile.am	(original)
+++ trunk/libanjuta/Makefile.am	Thu Jan 10 23:24:36 2008
@@ -70,7 +70,10 @@
 
 if HAVE_PLUGIN_GLADE
 
-gladeanjutadir = @GLADE_PLUGINS_PATH@
+# For now install in our own prefix
+# gladeanjutadir = @GLADE_PLUGINS_PATH@
+
+gladeanjutadir = $(libdir)/glade3/modules
 
 gladeanjuta_LTLIBRARIES = libgladeanjuta.la
 libgladeanjuta_la_DEPENDENCIES = libanjuta.la
@@ -79,8 +82,10 @@
 libgladeanjuta_la_LIBADD = $(top_builddir)/libanjuta/libanjuta.la \
 						   $(GLADE_LIBS)
 
-catalogdir = @GLADE_CATALOG_PATH@
+# For now install in our own prefix
+# catalogdir = @GLADE_CATALOG_PATH@
 
+catalogdir = $(datadir)/glade3/catalogs
 catalog_DATA = anjuta-glade.xml
 
 endif

Modified: trunk/plugins/sourceview/sourceview.c
==============================================================================
--- trunk/plugins/sourceview/sourceview.c	(original)
+++ trunk/plugins/sourceview/sourceview.c	Thu Jan 10 23:24:36 2008
@@ -60,7 +60,7 @@
 #include "sourceview.h"
 #include "sourceview-private.h"
 #include "sourceview-prefs.h"
-#include "sourceview-print.h"
+/* #include "sourceview-print.h" */
 #include "sourceview-cell.h"
 #include "plugin.h"