Drop prefix for systemd unit files and add AM_DISTCHECK_CONFIGURE_FLAGS

Unit files may also get installed to /etc or /lib. Instead pass working configure flags to distcheck.
blueman-project · May 5, 2018 · 25eb0e9 · cschramm · May 6, 2018 · infirit
1 parent 6685c80
commit 25eb0e9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -38,3 +38,8 @@ MAINTAINERCLEANFILES = 	\
 doc_DATA = ${DIST_DOCS}
 
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+
+# distcheck fails trying to install to the live filesystem
+AM_DISTCHECK_CONFIGURE_FLAGS = \
+    --with-systemdsystemunitdir='$$(prefix)/lib/systemd/system' \
+    --with-systemduserunitdir='$$(prefix)/lib/systemd/user'
diff --git a/data/configs/Makefile.am b/data/configs/Makefile.am
@@ -8,12 +8,12 @@ dbus_sessdir = $(datadir)/dbus-1/services
 dbus_sess_DATA = org.blueman.Applet.service
 
 if SYSTEMD_SYSTEM_UNIT_DIR
-systemd_systemdir = $(prefix)$(systemd_system_unit_dir)
+systemd_systemdir = $(systemd_system_unit_dir)
 systemd_system_DATA = blueman-mechanism.service
 endif
 
 if SYSTEMD_USER_UNIT_DIR
-systemd_userdir = $(prefix)$(systemd_user_unit_dir)
+systemd_userdir = $(systemd_user_unit_dir)
 systemd_user_DATA = blueman-applet.service
 endif