From e3a4049c247ec5435e2c0967e24802551536bc45 Mon Sep 17 00:00:00 2001
From: Philip Withnall <withnall@endlessm.com>
Date: Tue, 22 Aug 2017 18:32:43 +0100
Subject: [PATCH] build: Add distcheck configure flags to fix systemd and
 bash-completion

When running distcheck, the systemd system-generator and bash-completion
scripts are installed in absolute paths (/usr and /lib) as looked up
from their pkg-config files. This breaks distcheck. Use a
${prefix}-relative path for both of them when configuring for distcheck.

Signed-off-by: Philip Withnall <withnall@endlessm.com>

Closes: #1103
Approved by: cgwalters
---
 Makefile-bash.am       | 3 +++
 Makefile-switchroot.am | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/Makefile-bash.am b/Makefile-bash.am
index e61829a2..2cb03151 100644
--- a/Makefile-bash.am
+++ b/Makefile-bash.am
@@ -19,3 +19,6 @@
 
 completionsdir = @BASH_COMPLETIONSDIR@
 dist_completions_DATA = bash/ostree
+
+# Allow the distcheck install under $prefix test to pass
+AM_DISTCHECK_CONFIGURE_FLAGS += BASH_COMPLETIONSDIR='$${datadir}/bash-completion/completions'
diff --git a/Makefile-switchroot.am b/Makefile-switchroot.am
index dd24010e..70aa1c87 100644
--- a/Makefile-switchroot.am
+++ b/Makefile-switchroot.am
@@ -68,4 +68,7 @@ ostree_system_generator_SOURCES = src/switchroot/ostree-mount-util.h \
 ostree_system_generator_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/libglnx -I$(srcdir)/src/libostree
 ostree_system_generator_CFLAGS = $(AM_CFLAGS) $(OT_INTERNAL_GIO_UNIX_CFLAGS)
 ostree_system_generator_LDADD = $(AM_LDFLAGS) libglnx.la libostree-1.la $(OT_INTERNAL_GIO_UNIX_LIBS)
+
+# Allow the distcheck install under $prefix test to pass
+AM_DISTCHECK_CONFIGURE_FLAGS += --with-systemdsystemgeneratordir='$${libdir}/systemd/system-generators'
 endif