From c97d04c6f98646f4ffef185ed96f552c986da664 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@sbcglobal.net>
Date: Tue, 7 Jun 2016 03:28:15 -0400
Subject: fewer differences

---
 Makefile.am | 8 ++++++++
 move.sh     | 3 +++
 2 files changed, 11 insertions(+)

diff --git a/Makefile.am b/Makefile.am
index 0e67fd7ef8..c6fa3434c3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6546,10 +6546,18 @@ list-keys:
 
 add-key:
 	gpg --verbose --no-options --no-default-keyring --no-auto-key-locate --batch --trust-model=always --keyring=$(srcdir)/src/import/import-pubring.gpg --import -
+#@src/Makefile
+
 #@src/libudev/Makefile
 at.subdirs += src
 #@src/libsystemd/libsystemd-internal/subdir.mk
 systemd.CPPFLAGS += -DLIBDIR=\"$(libdir)\"
 systemd.CPPFLAGS += -DUDEVLIBEXECDIR=\"$(udevlibexecdir)\"
+#@src/grp-boot/Makefile
+at.subdirs += bootctl systemd-boot
+#@src/grp-coredump/Makefile
+at.subdirs += coredumpctl systemd-coredump
+#@src/grp-machine/Makefile
+at.subdirs += machinectl systemd-machined
 #@all
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/move.sh b/move.sh
index 99f935b627..6430e981b6 100755
--- a/move.sh
+++ b/move.sh
@@ -241,6 +241,9 @@ fixup_makefiles() (
 	    src/libbasic/Makefile \
 	    src/libsystemd/libsystemd-journal-internal/Makefile \
 	    src/udev/Makefile
+	find -type f -name Makefile|while read -r filename; do
+		sed -r -i "s|(/\.\.)*/config.mk|$(realpath -ms --relative-to="${filename#%/*}" config.mk)|" "$filename"
+	done
 )
 
 move() (
-- 
cgit v1.2.3-54-g00ecf