From: pancake <pancake@youterm.com>
Date: Thu, 15 Oct 2009 22:28:25 +0000 (+0200)
Subject: 'make install' archlinux
X-Git-Tag: 0.37.1~3^2~563
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9ceda544ef6884a9215deae688f659b3a7e1be37;p=thirdparty%2Fvala.git

'make install' archlinux
---

diff --git a/configure.in b/configure.in
index b782cdfc7..37baa2b5c 100644
--- a/configure.in
+++ b/configure.in
@@ -23,6 +23,7 @@ AM_CONDITIONAL(ENABLE_VALADOCORG, test x$enable_valadocorg = xyes)
 
 
 LIBVALA_REQUIRED=0.3.4
+LIBGEE_REQUIRED=0.5
 LIBGVC_REQUIRED=2.16
 GLIB_REQUIRED=2.12.0
 GTK_REQUIRED=2.10.0
@@ -50,6 +51,10 @@ PKG_CHECK_MODULES(LIBVALA, vala-1.0 >= $LIBVALA_REQUIRED)
 AC_SUBST(LIBVALA_CFLAGS)
 AC_SUBST(LIBVALA_LIBS)
 
+PKG_CHECK_MODULES(LIBGEE, gee-1.0 >= $LIBGEE_REQUIRED)
+AC_SUBST(LIBGEE_CFLAGS)
+AC_SUBST(LIBGEE_LIBS)
+
 PKG_CHECK_MODULES(LIBGDKPIXBUF, gdk-pixbuf-2.0 >= $LIBGDKPIXBUF_REQUIRED)
 AC_SUBST(LIBGDKPIXBUF_CFLAGS)
 AC_SUBST(LIBGDKPIXBUF_LIBS)
diff --git a/src/doclets/devhelp/doclet/Makefile.am b/src/doclets/devhelp/doclet/Makefile.am
index 131e3029b..7d4841b54 100644
--- a/src/doclets/devhelp/doclet/Makefile.am
+++ b/src/doclets/devhelp/doclet/Makefile.am
@@ -17,7 +17,7 @@ AM_CFLAGS =  -g                                             \
 BUILT_SOURCES = libdoclet.vala.stamp
 
 
-docletdir = $(libdir)/valadoc/plugins/devhelp/
+docletdir = $(libdir)/valadoc/plugins/devhelp//
 
 
 doclet_LTLIBRARIES =  \
diff --git a/src/doclets/htm/doclet/Makefile.am b/src/doclets/htm/doclet/Makefile.am
index 38d2d4d7c..ffe8a83f0 100644
--- a/src/doclets/htm/doclet/Makefile.am
+++ b/src/doclets/htm/doclet/Makefile.am
@@ -16,7 +16,7 @@ AM_CFLAGS =  -g                                             \
 BUILT_SOURCES = libdoclet.vala.stamp
 
 
-docletdir = $(libdir)/valadoc/plugins/html/
+docletdir = $(libdir)/valadoc/plugins/html//
 
 
 libdoclet_la_LDFLAGS = -module -avoid-version
diff --git a/src/doclets/htmlhelpers/doclet/Makefile.am b/src/doclets/htmlhelpers/doclet/Makefile.am
index 84688c61f..aaeafc53f 100644
--- a/src/doclets/htmlhelpers/doclet/Makefile.am
+++ b/src/doclets/htmlhelpers/doclet/Makefile.am
@@ -14,7 +14,7 @@ AM_CFLAGS =                   \
 BUILT_SOURCES = libhtmlhelpers.vala.stamp
 
 
-htmlhelpersdir = $(libdir)/valadoc/plugins/htmlhelpers/
+htmlhelpersdir = $(libdir)/valadoc/plugins/htmlhelpers//
 
 
 htmlhelpers_LTLIBRARIES =   \