[gnome-panel] fix 'make distcheck'
- From: Alberts Muktupāvels <muktupavels src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-panel] fix 'make distcheck'
- Date: Thu, 30 Oct 2014 10:39:17 +0000 (UTC)
commit 20688be3dccbe51855fb900f20066de327595a8d
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date: Thu Oct 30 12:35:52 2014 +0200
fix 'make distcheck'
Makefile.am | 4 +++-
configure.ac | 20 ++++++++++++++++++++
2 files changed, 23 insertions(+), 1 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index b1075aa..d1f8898 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,7 +12,9 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
DISTCHECK_CONFIGURE_FLAGS = \
--enable-gtk-doc \
- --enable-introspection
+ --enable-introspection \
+ --with-girdir='$${datadir}/gir-distcheck' \
+ --with-typelibdir='$${libdir}/girepository-distcheck'
EXTRA_DIST = \
COPYING-DOCS \
diff --git a/configure.ac b/configure.ac
index 3b55c70..927c4e5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -46,6 +46,26 @@ GNOME_COMPILE_WARNINGS([maximum])
# Check for introspection
GOBJECT_INTROSPECTION_CHECK([0.9.5])
+AC_ARG_WITH([girdir],
+ AS_HELP_STRING([--with-girdir=DIR], [Installation path for .gir files @<:@auto@:>@]),
+ [ac_with_girdir=$withval], [ac_with_girdir=""])
+if test "$ac_with_girdir" != ""; then
+ INTROSPECTION_GIRDIR=${ac_with_girdir}
+fi
+
+AC_ARG_WITH([typelibdir],
+ AS_HELP_STRING([--with-typelibdir=DIR],[Installation path for .typelib files @<:@auto@:>@]),
+ [ac_with_typelibdir=$withval], [ac_with_typelibdir=""])
+if test "$ac_with_typelibdir" != ""; then
+ INTROSPECTION_TYPELIBDIR=${ac_with_typelibdir}
+fi
+
+AC_MSG_NOTICE([installing .gir files in $INTROSPECTION_GIRDIR])
+AC_MSG_NOTICE([installing .typelib files in $INTROSPECTION_TYPELIBDIR])
+
+AC_SUBST(INTROSPECTION_GIRDIR)
+AC_SUBST(INTROSPECTION_TYPELIBDIR)
+
GLIB_GSETTINGS
m4_pattern_allow([AM_V_GEN])dnl Make autoconf not complain about the rule below
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]