tools/notsd-fixup: normalize nested.subdirs

1 files changed, 27 insertions, 14 deletions

diff --git a/tools/notsd-fixup b/tools/notsd-fixup
index 868260e503..77df56fff4 100755
--- a/tools/notsd-fixup
+++ b/tools/notsd-fixup
@@ -5,28 +5,41 @@
 
 fixup_makefiles() (
 	find "$@" -type f -name Makefile | while read -r filename; do
-		sed -r -i "s|(/\.\.)*/config.mk|/$(realpath -ms --relative-to="${filename%/*}" config.mk)|" "$filename"
+		{
+			<"$filename" sed -r \
+			 -e "s|(/\.\.)*/config.mk|/$(realpath -ms --relative-to="$(dirname -- "$filename")" config.mk)|" \
+			 -e '/^nested\.subdirs/d' \
+			 -e '/^include \$\(topsrcdir\)\/build-aux\/Makefile\.tail\.mk$/d'
+			echo
+			find "$(dirname "$filename")" -mindepth 2 -maxdepth 2 -name Makefile -print0 |
+			    xargs -r0 dirname -z -- |
+			    xargs -r0 basename -a -z |
+			    xargs -r0 printf 'nested.subdirs += %s\n' | sort
+			echo
+			echo 'include $(topsrcdir)/build-aux/Makefile.tail.mk'
+		} | cat -s | build-aux/write-ifchanged "$filename"
 	done
 )
 
 fixup_includes() (
-        find $(find . -type d -name include) -type d | while read -r dir; do
-                lib="${dir##*/}"
-                pushd "$dir" >/dev/null
-                find . -type f -exec sed -ri -e "s|$lib/||" -- {} +
-                popd >/dev/null
-        done
+	find $(find . -type d -name include) -type d | while read -r dir; do
+		lib="${dir##*/}"
+		pushd "$dir" >/dev/null
+		find . -type f -exec sed -ri -e "s|$lib/||" -- {} +
+		popd >/dev/null
+	done
 
-        find "$@" \( -name '*.h' -o -name '*.c' -o -name '*.gperf' \) -type f | while read -r filename; do
-                "$0"--includes "$filename"
-        done
+	find "$@" \( -name '*.h' -o -name '*.c' -o -name '*.gperf' \) -type f | while read -r filename; do
+		"$0"--includes "$filename"
+	done
 )
 
 main() {
-        set -e
-        set -o pipefail
-        fixup_makefiles "$@"
-        fixup_includes "$@"
+	set -e
+	set -o pipefail
+	export LC_COLLATE=C
+	fixup_makefiles "$@"
+	fixup_includes "$@"
 }
 
 main "$@"