From 93010a5bde39a26d51751edee9276c4c514f7bf4 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@lukeshu.com>
Date: Wed, 10 May 2017 15:50:48 -0400
Subject: move/fixup backport

---
 tools/notsd-fixup | 6 ++++++
 tools/notsd-move  | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/tools/notsd-fixup b/tools/notsd-fixup
index 71b3bf4dfa..820d2fec17 100755
--- a/tools/notsd-fixup
+++ b/tools/notsd-fixup
@@ -15,6 +15,12 @@ main() {
 	find "$@" -type f -name Makefile -print0 |
 		xargs -r0 sh -c "$0--makefiles \"\$@\" || exit 255" --
 
+	# GNUmakefiles
+	find "$@" -type l -name GNUmakefile -delete
+	# It's OK for the top-level one to fail
+	find "$@" -type f -name Makefile -printf '%h\0' |
+		xargs -r0 -I {} ln -s -t {} GNUmakefile
+
 	# C includes
 	rm -rf -- "$0"--includes.cache
 	find "$@" \( -name '*.h' -o -name '*.c' -o -name '*.gperf' -o -name '*.gperf.m4' \) -type f -print0 |
diff --git a/tools/notsd-move b/tools/notsd-move
index 3d3205262f..30f63d354f 100755
--- a/tools/notsd-move
+++ b/tools/notsd-move
@@ -359,7 +359,7 @@ move_files() (
 	   src/login/*.rules \
 	   src/login/*.rules.in \
 	   src/login/org.*
-	mv -T src/login/systemd-user.m4 src/systemd-logind/systemd-user.pam.m4
+	mv -T src/login/systemd-user.m4 src/pam_systemd/systemd-user.pam.m4
 	rmdir src/login
 
 	# src/timedate => src/...
@@ -663,6 +663,7 @@ move_files() (
 	    src/libcore \
 	    src/systemctl \
 	    src/systemd \
+	    src/systemd-cgroups-agent \
 	    src/systemd-shutdown
 	grp src/grp-system/grp-utils \
 	    src/systemd-analyze \
-- 
cgit v1.2.3-54-g00ecf