summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2015-09-18 09:10:30 +0200
committerMiklos Vajna <vmiklos@collabora.co.uk>2015-09-18 09:01:39 +0000
commitc722e9e728ec6c9df0285f5dd2041aa58f66f686 (patch)
tree52287d2c4b45aed3e9f70de6a3d3b3d53a512bb1
parent36c11cb71c6ec107cc08b16109e468765abc9867 (diff)
sysui: introspection wants ${INSTDIR}, not ${DESTDIR}/${INSTALLDIR}
The later can be empty for the generic rpm case. Change-Id: I69c62dcd2a16004c7927c9cf67837463e6411a8d Reviewed-on: https://gerrit.libreoffice.org/18675 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
-rw-r--r--configure.ac5
-rwxr-xr-xsysui/desktop/share/create_tree.sh2
2 files changed, 5 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index 7e8115072b8b..4259a89a679e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9962,7 +9962,10 @@ if test "x$enable_gtk3" = "xyes"; then
PKG_CHECK_MODULES(GTK3, gtk+-3.0 >= 3.8 gtk+-unix-print-3.0 gmodule-no-export-2.0 glib-2.0 >= 2.38 cairo, ENABLE_GTK3="TRUE", ENABLE_GTK3="")
if test "x$ENABLE_GTK3" = "xTRUE"; then
R="gtk3"
- GOBJECT_INTROSPECTION_CHECK(INTROSPECTION_REQUIRED_VERSION)
+ dnl Avoid installed by unpackaged files for now.
+ if test -z "$PKGFORMAT"; then
+ GOBJECT_INTROSPECTION_CHECK(INTROSPECTION_REQUIRED_VERSION)
+ fi
else
AC_MSG_ERROR([gtk3 or dependent libraries of the correct versions, not found])
fi
diff --git a/sysui/desktop/share/create_tree.sh b/sysui/desktop/share/create_tree.sh
index c73b89af3ab5..86d2837fed0f 100755
--- a/sysui/desktop/share/create_tree.sh
+++ b/sysui/desktop/share/create_tree.sh
@@ -93,7 +93,7 @@ if [ -n "$INTROSPECTION_SCANNER" ]; then
g-ir-scanner "${SRCDIR}/include/LibreOfficeKit/LibreOfficeKitGtk.h" "${SRCDIR}/libreofficekit/source/gtk/lokdocview.cxx" \
`${PKG_CONFIG} --cflags gobject-introspection-1.0 gtk+-3.0` -I"${SRCDIR}/include/" \
--include=GLib-2.0 --include=GObject-2.0 --include=Gio-2.0 \
- --library=libreofficekitgtk --library-path="${DESTDIR}/${INSTALLDIR}/program" \
+ --library=libreofficekitgtk --library-path="${INSTDIR}/program" \
--include=Gdk-3.0 --include=GdkPixbuf-2.0 --include=Gtk-3.0 \
--namespace=LOKDocView --nsversion=0.1 --identifier-prefix=LOKDoc --symbol-prefix=lok_doc \
--output="${DESTDIR}/${PREFIXDIR}/share/gir-1.0/LOKDocView-0.1.gir" --warn-all --no-libtool