From 9159cc2289ad0fd04eaaeb109ab2cc893c794a50 Mon Sep 17 00:00:00 2001
From: Morten Welinder <terra@gnome.org>
Date: Tue, 1 May 2018 20:19:17 -0400
Subject: [PATCH] distcheck: allow specifying where component should be
 installed.

This is probably useful for the build process only.
---
 Makefile.am  |  6 +++++-
 configure.ac | 12 ++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index 6c88f0ce4..d990accc9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,11 +8,15 @@ change_logs = ChangeLog
 CLEANFILES = gnumeric.desktop gnumeric.keys gnumeric.appdata.xml
 DISTCLEANFILES = intltool-extract intltool-merge intltool-update $(pkgconfig_DATA)
 
+# Flags for distcheck, mostly to install things that nominally go under the
+# directories of other packages into the dist dir instead.  (They won't work
+# there, but that's ok.)
 DISTCHECK_CONFIGURE_FLAGS = --without-perl --without-python \
 	--enable-introspection=auto \
 	--with-gir-dir=\$${datadir}/gir-1.0 \
 	--with-typelib-dir=\$${libdir}/girepository-1.0 \
-	--with-gi-overrides-dir=\$${libdir}/gi/overrides
+	--with-gi-overrides-dir=\$${libdir}/gi/overrides \
+	--with-goffice-plugins-dir=\$${libdir}/goffice
 
 DIST_SAMPLES = $(shell (cd $(srcdir)/test && perl -e 'use GnumericTest; foreach (&GnumericTest::corpus("dist")) { print "$$_\n"; }'))
 
diff --git a/configure.ac b/configure.ac
index fa0b6aa84..95822b6d6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1134,6 +1134,18 @@ AC_ARG_WITH([gi-overrides-dir],
 )
 AC_SUBST(GIOVERRIDESDIR)
 
+AC_ARG_WITH([goffice-plugins-dir],
+	AS_HELP_STRING(
+		[--with-goffice-plugins-dir],
+		[
+		 path to goffice plugins
+		 (automatically detected via pkg-config)
+		]
+	),
+	[GOFFICE_PLUGINS_DIR=$withval],
+	[:]
+)
+
 
 dnl **************************************************
 dnl * Config defaults
-- 
2.11.4.GIT