From 5caf817f3d48ea67893cd0b2e9c91f2f323a5356 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@sbcglobal.net>
Date: Thu, 15 Sep 2016 01:31:23 -0400
Subject: stuff

---
 tools/notsd-move | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'tools/notsd-move')

diff --git a/tools/notsd-move b/tools/notsd-move
index 0e8cc0dd87..5a907109bd 100755
--- a/tools/notsd-move
+++ b/tools/notsd-move
@@ -697,10 +697,6 @@ breakup_makefile() (
 	rm .tmp.move.all
 
 	sed -ri \
-	    -e '/^	\$\(AM_V_at\)\$\(MKDIR_P\) \$\(dir \$@\)/d' \
-	    -e 's/ \$\(CFLAGS\) / /g' \
-	    -e 's/ \$\(CPPFLAGS\) / /g' \
-	    -e 's/ \$\(AM_CPPFLAGS\) / $(sd.ALL_CPPFLAGS) /g' \
 	    -e '/^[^#	]*:/ { s|\S+/|$(outdir)/|g }' \
 	    src/libbasic/include/basic/Makefile \
 	    src/libsystemd/src/Makefile \
@@ -745,8 +741,13 @@ breakup_makefile() (
 
 fixup_makefile() {
 	sed -r \
+	    -e '#### Specific complete strings #####' \
+	    -e 's|\$\(CPP\)·\$\(CFLAGS\)·\$\(AM_CPPFLAGS\)·\$\(CPPFLAGS\)·|$(CPP) $(sd.ALL_CPPFLAGS) |g' \
+	    -e '/^	\$\(AM_V_at\)\$\(MKDIR_P\) \$\(dir \$@\)/d' \
+	    -e '#### General cases #################' \
 	    -e '/^[^#	]*:/ { s|^(\s*)\S+/|\1$(outdir)/| }' \
 	    -e 's|^if (.*)|ifneq ($(\1),)|' \
+	    -e '/\bAM_(C|CPP|LD)FLAGS\b/d' \
 	    -e 's|--version-script=.*/([^/]+)\.sym|--version-script=$(srcdir)/\1.sym|g'
 }
 
-- 
cgit v1.2.3-54-g00ecf


From 17b593aacd4e8d056f2be860a7b744004892ecbd Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@sbcglobal.net>
Date: Thu, 15 Sep 2016 01:48:15 -0400
Subject: fix

---
 tools/notsd-move | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'tools/notsd-move')

diff --git a/tools/notsd-move b/tools/notsd-move
index 5a907109bd..2f6ad3f1b0 100755
--- a/tools/notsd-move
+++ b/tools/notsd-move
@@ -742,12 +742,12 @@ breakup_makefile() (
 fixup_makefile() {
 	sed -r \
 	    -e '#### Specific complete strings #####' \
-	    -e 's|\$\(CPP\)·\$\(CFLAGS\)·\$\(AM_CPPFLAGS\)·\$\(CPPFLAGS\)·|$(CPP) $(sd.ALL_CPPFLAGS) |g' \
+	    -e 's|\$\(CPP\) \$\(CFLAGS\) \$\(AM_CPPFLAGS\) \$\(CPPFLAGS\)|$(CPP) $(sd.ALL_CPPFLAGS)|g' \
 	    -e '/^	\$\(AM_V_at\)\$\(MKDIR_P\) \$\(dir \$@\)/d' \
 	    -e '#### General cases #################' \
 	    -e '/^[^#	]*:/ { s|^(\s*)\S+/|\1$(outdir)/| }' \
 	    -e 's|^if (.*)|ifneq ($(\1),)|' \
-	    -e '/\bAM_(C|CPP|LD)FLAGS\b/d' \
+	    -e '/^\s*\$\(AM_(C|CPP|LD)FLAGS\b/d' \
 	    -e 's|--version-script=.*/([^/]+)\.sym|--version-script=$(srcdir)/\1.sym|g'
 }
 
-- 
cgit v1.2.3-54-g00ecf