[grilo/0.1.x] vala: Do not install VAPI files in specific vapi directory of the compiler

[Juan A. Suarez Romero <jasuarez src gnome org>]

commit 6076360ba79a72a0dab946db35f17c77efaa1f9b
Author: Juan A. Suarez Romero <jasuarez igalia com>
Date:   Wed Aug 8 16:22:44 2012 +0000

    vala: Do not install VAPI files in specific vapi directory of the compiler
    
    Rather, install it in $(datadir)/vala/vapi place.

 bindings/vala/Makefile.am |    2 +-
 configure.ac              |    5 -----
 2 files changed, 1 insertions(+), 6 deletions(-)
---
diff --git a/bindings/vala/Makefile.am b/bindings/vala/Makefile.am
index 76548e1..b49c1e3 100644
--- a/bindings/vala/Makefile.am
+++ b/bindings/vala/Makefile.am
@@ -52,7 +52,7 @@ depsfiles = $(foreach target,$(targets),$(target).deps)
 gifiles = $(foreach target,$(targets),$(target).gi)
 metadatafiles = $(foreach target,$(targets),$(target).metadata)
 
-vapidir = $(VAPIDIR)
+vapidir = $(datadir)/vala/vapi
 
 if HAVE_VALA
 vapifiles = $(foreach target,$(targets),$(target).vapi)
diff --git a/configure.ac b/configure.ac
index e65a227..b1660aa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -191,11 +191,6 @@ if test "x$enable_vala" != "xno"; then
                         AC_MSG_ERROR([No Vala compiler found.])
                 fi
 
-                if test "x$VAPIDIR" = "x"; then
-                        VAPIDIR=`$PKG_CONFIG --variable=vapidir $valapkg`
-                fi
-                AC_SUBST([VAPIDIR])
-
                 AC_PATH_PROG([VALA_GEN_INTROSPECT], [vala-gen-introspect])
                 if test "x$VALA_GEN_INTROSPECT" = "x"; then
                         AC_MSG_ERROR([Cannot find "vala-gen-introspect" in your PATH])