1 files changed, 26 insertions, 29 deletions

diff --git a/scripts/gen_build_files.sh b/scripts/gen_build_files.sh
index 647c7daf7..968158758 100755
--- a/scripts/gen_build_files.sh
+++ b/scripts/gen_build_files.sh
@@ -4,6 +4,8 @@ test $# -ge 2 || { echo "Syntax: $0 SRCTREE OBJTREE"; exit 1; }
 
 # cd to objtree
 cd -- "$2" || { echo "Syntax: $0 SRCTREE OBJTREE"; exit 1; }
+# In separate objtree build, include/ might not exist yet
+mkdir include 2>/dev/null
 
 srctree="$1"
 
@@ -11,20 +13,19 @@ srctree="$1"
 src="$srctree/include/applets.src.h"
 dst="include/applets.h"
 s=`sed -n 's@^//applet:@@p' -- "$srctree"/*/*.c "$srctree"/*/*/*.c`
-echo "/* DO NOT EDIT. This file is generated from applets.src.h */" >"$dst.$$.tmp"
+old=`cat "$dst" 2>/dev/null`
 # Why "IFS='' read -r REPLY"??
 # This atrocity is needed to read lines without mangling.
 # IFS='' prevents whitespace trimming,
 # -r suppresses backslash handling.
+new=`echo "/* DO NOT EDIT. This file is generated from applets.src.h */"
 while IFS='' read -r REPLY; do
         test x"$REPLY" = x"INSERT" && REPLY="$s"
         printf "%s\n" "$REPLY"
-done <"$src" >>"$dst.$$.tmp"
-if test -f "$dst" && cmp -s "$dst.$$.tmp" "$dst"; then
-        rm -- "$dst.$$.tmp"
-else
+done <"$src"`
+if test x"$new" != x"$old"; then
         echo "  GEN     $dst"
-        mv -- "$dst.$$.tmp" "$dst"
+        printf "%s\n" "$new" >"$dst"
 fi
 
 # (Re)generate include/usage.h
@@ -35,62 +36,58 @@ dst="include/usage.h"
 # with space or tab
 # (note: we need to use \\\\ because of ``)
 s=`sed -n -e 's@^//usage:\([ \t].*\)$@\1 \\\\@p' -e 's@^//usage:\([^ \t].*\)$@\n\1 \\\\@p' -- "$srctree"/*/*.c "$srctree"/*/*/*.c`
-echo "/* DO NOT EDIT. This file is generated from usage.src.h */" >"$dst.$$.tmp"
-# Why "IFS='' read -r REPLY"??
-# This atrocity is needed to read lines without mangling.
-# IFS='' prevents whitespace trimming,
-# -r suppresses backslash handling.
+old=`cat "$dst" 2>/dev/null`
+new=`echo "/* DO NOT EDIT. This file is generated from usage.src.h */"
 while IFS='' read -r REPLY; do
         test x"$REPLY" = x"INSERT" && REPLY="$s"
         printf "%s\n" "$REPLY"
-done <"$src" >>"$dst.$$.tmp"
-if test -f "$dst" && cmp -s "$dst.$$.tmp" "$dst"; then
-        rm -- "$dst.$$.tmp"
-else
+done <"$src"`
+if test x"$new" != x"$old"; then
         echo "  GEN     $dst"
-        mv -- "$dst.$$.tmp" "$dst"
+        printf "%s\n" "$new" >"$dst"
 fi
 
 # (Re)generate */Kbuild and */Config.in
-find -type d | while read -r d; do
+{ cd -- "$srctree" && find -type d; } | while read -r d; do
         d="${d#./}"
+
         src="$srctree/$d/Kbuild.src"
         dst="$d/Kbuild"
+        mkdir -p -- "$d" 2>/dev/null
         if test -f "$src"; then
                 #echo "  CHK     $dst"
 
                 s=`sed -n 's@^//kbuild:@@p' -- "$srctree/$d"/*.c`
 
-                echo "# DO NOT EDIT. This file is generated from Kbuild.src" >"$dst.$$.tmp"
+                old=`cat "$dst" 2>/dev/null`
+                new=`echo "# DO NOT EDIT. This file is generated from Kbuild.src"
                 while IFS='' read -r REPLY; do
                         test x"$REPLY" = x"INSERT" && REPLY="$s"
                         printf "%s\n" "$REPLY"
-                done <"$src" >>"$dst.$$.tmp"
-                if test -f "$dst" && cmp -s "$dst.$$.tmp" "$dst"; then
-                        rm -- "$dst.$$.tmp"
-                else
+                done <"$src"`
+                if test x"$new" != x"$old"; then
                         echo "  GEN     $dst"
-                        mv -- "$dst.$$.tmp" "$dst"
+                        printf "%s\n" "$new" >"$dst"
                 fi
         fi
 
         src="$srctree/$d/Config.src"
         dst="$d/Config.in"
+        mkdir -p -- "$d" 2>/dev/null
         if test -f "$src"; then
                 #echo "  CHK     $dst"
 
                 s=`sed -n 's@^//config:@@p' -- "$srctree/$d"/*.c`
 
-                echo "# DO NOT EDIT. This file is generated from Config.src" >"$dst.$$.tmp"
+                old=`cat "$dst" 2>/dev/null`
+                new=`echo "# DO NOT EDIT. This file is generated from Config.src"
                 while IFS='' read -r REPLY; do
                         test x"$REPLY" = x"INSERT" && REPLY="$s"
                         printf "%s\n" "$REPLY"
-                done <"$src" >>"$dst.$$.tmp"
-                if test -f "$dst" && cmp -s "$dst.$$.tmp" "$dst"; then
-                        rm -- "$dst.$$.tmp"
-                else
+                done <"$src"`
+                if test x"$new" != x"$old"; then
                         echo "  GEN     $dst"
-                        mv -- "$dst.$$.tmp" "$dst"
+                        printf "%s\n" "$new" >"$dst"
                 fi
         fi
 done