[babl] Fix install of babl vapi file
- From: Jon Nordby <jonnor src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [babl] Fix install of babl vapi file
- Date: Wed, 3 Aug 2011 22:54:57 +0000 (UTC)
commit 03f6eb4f5b567406b23933b65c868f480ec7abd0
Author: Jon Nordby <jononor gmail com>
Date: Thu Aug 4 00:45:04 2011 +0200
Fix install of babl vapi file
The pkg-config package refered no longer exists,
and currently only libvala provides a vapidir in pkg-config,
and this package is versioned and changes all the time.
Other projects just use $(datadir)/vala/vapi, so we do the same
babl/Makefile.am | 2 +-
configure.ac | 3 ---
2 files changed, 1 insertions(+), 4 deletions(-)
---
diff --git a/babl/Makefile.am b/babl/Makefile.am
index 8b48f10..ae45b02 100644
--- a/babl/Makefile.am
+++ b/babl/Makefile.am
@@ -125,7 +125,7 @@ if HAVE_VALA
babl-$(BABL_API_VERSION).vapi: Babl-$(BABL_API_VERSION).gir
$(VAPIGEN) --library=babl-$(BABL_API_VERSION) Babl-$(BABL_API_VERSION).gir
-vapidir= vapidir@
+vapidir=$(datadir)/vala/vapi
vapi_DATA = babl-$(BABL_API_VERSION).vapi
endif # HAVE_VALA
diff --git a/configure.ac b/configure.ac
index 126b5e4..02b43f6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -85,9 +85,6 @@ fi
have_vala=$have_vapigen
AM_CONDITIONAL(HAVE_VALA, test "$have_vala" = "yes")
-vapidir=$(pkg-config --variable vapidir vala-1.0)
-AC_SUBST(vapidir)
-
dnl The symbol BABL_UNSTABLE is defined above for substitution in
dnl Makefiles and conditionally defined here as a preprocessor symbol
dnl and automake conditional.
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]