From 735e73661634b922fbc014b798d1040981d5c962 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@sbcglobal.net>
Date: Wed, 1 Jun 2016 15:37:52 -0400
Subject: tidy

---
 move.sh | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/move.sh b/move.sh
index 03fb82d321..e72f781a46 100755
--- a/move.sh
+++ b/move.sh
@@ -128,7 +128,7 @@ breakup_makefile() (
 			fi
                         printf '%s\n' "$line" >> "$file"
                 fi
-        done < <(sed -r 's|^if (.*)|ifneq ($(\1),)|' <Makefile.am)
+        done < <(fixup_makefile <Makefile.am)
         rm .tmp.move.all
 )
 
@@ -138,9 +138,13 @@ fixup_includes() (
 	    xargs -d $'\n' sed -ri 's|#include "(sd-[^"]*)"|#include <systemd/\1>|'
 )
 
+fixup_makefile() {
+	sed -r \
+	    -e '/^[^#]*:/ { s|^(\s*)\S+/|\1$(outdir)/| }' \
+	    -e 's|^if (.*)|ifneq ($(\1),)|'
+}
+
 fixup_makefiles() (
-	find src -type f -name Makefile \
-	     -exec sed -ri '/^[^#]*:/ { s|^(\s*)\S+/|\1$(outdir)/| }' -- {} +
 	sed -ri \
 	    -e '/^	\$\(AM_V_at\)\$\(MKDIR_P\) \$\(dir \$@\)/d' \
 	    -e '/ \$\(CFLAGS\) / /g' \
-- 
cgit v1.2.3-54-g00ecf