[gjs] Fix build with automake 1.11.2
- From: Jasper St. Pierre <jstpierre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gjs] Fix build with automake 1.11.2
- Date: Wed, 4 Jan 2012 19:58:56 +0000 (UTC)
commit ea4d639eab307737870479b6573d5dab9fb2915a
Author: Marc-Antoine Perennou <Marc-Antoine Perennou com>
Date: Wed Jan 4 12:07:17 2012 +0100
Fix build with automake 1.11.2
libdir_DATA is not allowed anymore with automake 1.11.2
installing gir and typelib to the standard location instead
Signed-off-by: Marc-Antoine Perennou <Marc-Antoine Perennou com>
https://bugzilla.gnome.org/show_bug.cgi?id=667250
Makefile.am | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 8f21a90..ddf30d1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -166,7 +166,12 @@ include Makefile-gjs-dbus.am
include Makefile-modules.am
include Makefile-examples.am
-pkglib_DATA = $(INTROSPECTION_GIRS) $(INTROSPECTION_GIRS:.gir=.typelib)
+girdir = $(datadir)/gir-1.0
+gir_DATA = $(INTROSPECTION_GIRS)
+
+typelibdir = $(libdir)/girepository-1.0
+typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
+
########################################################################
bin_PROGRAMS += gjs-console
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]