Merge #9140: Bugfix: Correctly replace generated headers and fail cleanly

b74ff5c Bugfix: Correctly replace generated headers and fail cleanly (Luke Dashjr)

src/Makefile.bench.include

@@ -67,7 +67,9 @@ bitcoin_bench_clean : FORCE
 
 %.raw.h: %.raw
 	@$(MKDIR_P) $(@D)
-	@echo "static unsigned const char $(*F)[] = {" >> $@
+	@{ \
-	@$(HEXDUMP) -v -e '8/1 "0x%02x, "' -e '"\n"' $< | $(SED) -e 's/0x  ,//g' >> $@
+	 echo "static unsigned const char $(*F)[] = {" && \
-	@echo "};" >> $@
+	 $(HEXDUMP) -v -e '8/1 "0x%02x, "' -e '"\n"' $< | $(SED) -e 's/0x  ,//g' && \
+	 echo "};"; \
+	} > "$@.new" && mv -f "$@.new" "$@"
 	@echo "Generated $@"

src/Makefile.test.include

@@ -149,16 +149,10 @@ endif
 
 %.json.h: %.json
 	@$(MKDIR_P) $(@D)
-	@echo "namespace json_tests{" > $@
+	@{ \
-	@echo "static unsigned const char $(*F)[] = {" >> $@
+	 echo "namespace json_tests{" && \
-	@$(HEXDUMP) -v -e '8/1 "0x%02x, "' -e '"\n"' $< | $(SED) -e 's/0x  ,//g' >> $@
+	 echo "static unsigned const char $(*F)[] = {" && \
-	@echo "};};" >> $@
+	 $(HEXDUMP) -v -e '8/1 "0x%02x, "' -e '"\n"' $< | $(SED) -e 's/0x  ,//g' && \
-	@echo "Generated $@"
+	 echo "};};"; \
-
+	} > "$@.new" && mv -f "$@.new" "$@"
-%.raw.h: %.raw
-	@$(MKDIR_P) $(@D)
-	@echo "namespace alert_tests{" > $@
-	@echo "static unsigned const char $(*F)[] = {" >> $@
-	@$(HEXDUMP) -v -e '8/1 "0x%02x, "' -e '"\n"' $< | $(SED) -e 's/0x  ,//g' >> $@
-	@echo "};};" >> $@
 	@echo "Generated $@"