Merge branch 'lukeshu/postmove' into lukeshu/master

1 files changed, 4 insertions, 2 deletions

diff --git a/move.sh b/move.sh
index 136e991556..b817974ecf 100755
--- a/move.sh
+++ b/move.sh
@@ -255,8 +255,10 @@ breakup_makefile() (
 
 fixup_includes() (
 	find src \( -name '*.h' -o -name '*.c' \) \
-	     -exec grep '#include "sd-' -l -- {} + |
-	    xargs -d $'\n' sed -ri 's|#include "(sd-[^"]*)"|#include <systemd/\1>|'
+	     -exec grep '#include ["<]sd-' -l -- {} + |
+	    xargs -d $'\n' sed -ri \
+		  -e 's|#include "(sd-[^"]*)"|#include <systemd/\1>|' \
+		  -e 's|#include <(sd-[^>]*)>|#include <systemd/\1>|'
 )
 
 fixup_makefile() {