summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xtools/notsd-fixup6
-rwxr-xr-xtools/notsd-move3
2 files changed, 8 insertions, 1 deletions
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 \