[libgda/LIBGDA_5.2] introspection: removed system install in favor of --prefix
- From: Daniel Espinosa Ortiz <despinosa src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libgda/LIBGDA_5.2] introspection: removed system install in favor of --prefix
- Date: Fri, 26 Oct 2018 21:28:35 +0000 (UTC)
commit 67c1857983fda1f0891d83662c9953f3a34a063c
Author: Daniel Espinosa <esodan gmail com>
Date: Fri Oct 26 16:27:19 2018 -0500
introspection: removed system install in favor of --prefix
Introspection data, now is installed relative to --prefix directory
configure.ac | 5 -----
libgda-ui/Makefile.am | 5 -----
libgda/Makefile.am | 5 -----
3 files changed, 15 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 05ba496b7..c01f460f1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -492,11 +492,6 @@ fi
AM_CONDITIONAL(ENABLE_GDAUI_GI, [test x$disable_gdaui_gi != xyes])
-AC_ARG_ENABLE([gi-system-install],
- AS_HELP_STRING([--enable-gi-system-install[=@<:@no/auto/yes@:>@]], [Install GObject Introspection files
along with system installed files [default=yes]]),
- [enable_gi_system_install=$enableval],[enable_gi_system_install=yes])
-AM_CONDITIONAL(ENABLE_GI_SYSTEM_INSTALL, [test x"$enable_gi_system_install" = "xyes"])
-
dnl ******************************
dnl Check for Vala Compiler
dnl ******************************
diff --git a/libgda-ui/Makefile.am b/libgda-ui/Makefile.am
index bdd8bff83..76106f7fe 100644
--- a/libgda-ui/Makefile.am
+++ b/libgda-ui/Makefile.am
@@ -239,13 +239,8 @@ Gdaui_5_0_gir_FILES = $(addprefix $(srcdir)/,$(introspection_sources))
INTROSPECTION_COMPILER_ARGS = --includedir=$(top_builddir)/libgda
INTROSPECTION_GIRS += Gdaui-5.0.gir
-if ENABLE_GI_SYSTEM_INSTALL
-girdir = $(INTROSPECTION_GIRDIR)
-typelibsdir = $(INTROSPECTION_TYPELIBDIR)
-else
girdir = $(datadir)/gir-1.0
typelibsdir = $(libdir)/girepository-1.0
-endif
gir_DATA = $(INTROSPECTION_GIRS)
typelibs_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
diff --git a/libgda/Makefile.am b/libgda/Makefile.am
index 200529af1..4b8a99770 100644
--- a/libgda/Makefile.am
+++ b/libgda/Makefile.am
@@ -349,13 +349,8 @@ Gda_5_0_gir_FILES = $(addprefix $(srcdir)/,$(introspection_sources))
Gda_5_0_gir_FILES += $(gda_built_sources)
INTROSPECTION_GIRS += Gda-5.0.gir
-if ENABLE_GI_SYSTEM_INSTALL
-girdir = $(INTROSPECTION_GIRDIR)
-typelibsdir = $(INTROSPECTION_TYPELIBDIR)
-else
girdir = $(datadir)/gir-1.0
typelibsdir = $(libdir)/girepository-1.0
-endif
gir_DATA = $(INTROSPECTION_GIRS)
typelibs_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]