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>

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

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