Fix build without GIO again (sorry).

Remove trailing slashes in Makefile.am's (patch by Daniel Richard G., thanks).

git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@3463 ea778897-0a13-0410-b9d1-a72fbfd435f5

ChangeLog

@@ -20,6 +20,11 @@
    Don't fold toplevel PHP script tags (part of #2003912).
    Replace remaining occurences of sptr_t by uptr_t in the third
    argument of SSM() calls.
+ * plugins/Makefile.am, src/Makefile.am, src/utils.c,
+   tagmanager/include/Makefile.am:
+   Fix build without GIO again (sorry).
+   Remove trailing slashes in Makefile.am's
+   (patch by Daniel Richard G., thanks).
 
 
 2009-01-09  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>

plugins/Makefile.am

@@ -8,7 +8,7 @@ EXTRA_DIST = \
 
 plugindir = $(libdir)/geany
 
-plugins_includedir = $(includedir)/geany/
+plugins_includedir = $(includedir)/geany
 plugins_include_HEADERS = \
 	pluginmacros.h \
 	geanyfunctions.h

src/Makefile.am

@@ -49,7 +49,7 @@ SRCS = \
 	utils.c utils.h
 
 
-geany_includedir = $(includedir)/geany/
+geany_includedir = $(includedir)/geany
 geany_include_HEADERS = \
 	dialogs.h \
 	document.h \

src/utils.c

@@ -43,7 +43,10 @@
 #endif
 
 #include <glib/gstdio.h>
-#include <gio/gio.h>
+
+#ifdef HAVE_GIO
+# include <gio/gio.h>
+#endif
 
 #include "prefs.h"
 #include "support.h"

tagmanager/include/Makefile.am

@@ -1,7 +1,7 @@
 noinst_HEADERS = \
 	gnuregex.h
 
-tagmanager_includedir = $(includedir)/geany/tagmanager/
+tagmanager_includedir = $(includedir)/geany/tagmanager
 tagmanager_include_HEADERS = \
 	tm_project.h \
 	tm_source_file.h \