include/Makefile.am, clients/Makefile.am: fix possible clashes of parallel re-generation of nut_version.h and/or libupsclient-version.h [networkupstools#2875]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>

Author: jimklimov

clients/.gitignore

@@ -1,5 +1,5 @@
 /libupsclient-version.h
-/libupsclient-version.h.tmp
+/libupsclient-version.h.tmp*
 /upsimage.cgi
 /upsset.cgi
 /upsstats.cgi

clients/Makefile.am

@@ -132,9 +132,10 @@ endif HAVE_WINDOWS
 #   dlname='libupsclient-6.dll'
 #   library_names='libupsclient.dll.a'
 #   libdir='//lib'
-CLEANFILES += libupsclient-version.h libupsclient-version.h.tmp
+CLEANFILES += libupsclient-version.h libupsclient-version.h.tmp*
 libupsclient-version.h: libupsclient.la
 	@echo "  GENERATE-HEADER	$@" ; \
+	 RES=0; \
 	 dlname_filter() { sed -e 's/^[^=]*=//' -e 's/^"\(.*\)"$$/\1/' -e 's/^'"'"'\(.*\)'"'"'$$/\1/' ; }; \
 	 SOFILE_LIBUPSCLIENT="`grep -E '^dlname' '$?' | dlname_filter`" \
 	 || SOFILE_LIBUPSCLIENT="" ; \
@@ -144,19 +145,21 @@ libupsclient-version.h: libupsclient.la
 	 else \
 	    printf "#ifndef SOFILE_LIBUPSCLIENT\n# define SOFILE_LIBUPSCLIENT \"%s\"\n#endif\n\n" "$${SOFILE_LIBUPSCLIENT}" ; \
 	    printf "#ifndef SOPATH_LIBUPSCLIENT\n# define SOPATH_LIBUPSCLIENT \"%s/%s\"\n#endif\n\n" "@LIBDIR@" "$${SOFILE_LIBUPSCLIENT}" ; \
-	 fi > "$@".tmp
-	@if test -f "$@" && test -s "$@" ; then \
-		if cmp -s "$@.tmp" "$@" ; then \
+	 fi > "$@".tmp.$$$$ && \
+	 if test -f "$@" && test -s "$@" ; then \
+		if cmp -s "$@.tmp.$$$$" "$@" ; then \
 			echo "  GENERATE-HEADER	$@ did not change" ; \
 		else \
 			echo "  GENERATE-HEADER	$@ got changed" ; \
-			cp "$@.tmp" "$@" ; \
+			cp "$@.tmp.$$$$" "$@" ; \
 		fi ; \
 	 else \
 		echo "  GENERATE-HEADER	$@ was absent"; \
-		cp "$@.tmp" "$@" ; \
-	 fi
-	-rm -f "$@.tmp"
+		cp "$@.tmp.$$$$" "$@" ; \
+	 fi \
+	 || RES=$$?; \
+	 rm -f "$@.tmp.$$$$" ; \
+	 exit $$RES
 
 if HAVE_CXX11
 # libnutclient version information and build

include/.gitignore

@@ -1,5 +1,6 @@
 /config.h
 /config.h.in
 /nut_version.h
+/nut_version.h.tmp*
 /stamp-h1
 /stamp-h.in

include/Makefile.am

@@ -31,14 +31,15 @@ endif !WITH_DEV
 
 # http://www.gnu.org/software/automake/manual/automake.html#Clean
 BUILT_SOURCES = nut_version.h
-CLEANFILES = nut_version.h
+CLEANFILES = nut_version.h nut_version.h.tmp*
 MAINTAINERCLEANFILES = Makefile.in .dirstamp
 
 # magic to include Git version information in NUT version string
 # (for builds not made from the tagged commit in a Git workspace)
 
 nut_version.h: @FORCE_NUT_VERSION@
 	@echo "  GENERATE-HEADER	$@" ; \
+	 RES=0; \
 	 GITREV="`$(top_srcdir)/tools/gitlog2version.sh`" || GITREV=""; \
 	 GITREV_IS_RELEASE="`NUT_VERSION_QUERY=IS_RELEASE $(top_srcdir)/tools/gitlog2version.sh 2>/dev/null`" || GITREV_IS_RELEASE="false"; \
 	 GITREV_SEMVER="`NUT_VERSION_QUERY=SEMVER $(top_srcdir)/tools/gitlog2version.sh 2>/dev/null`" || GITREV_SEMVER=""; \
@@ -64,20 +65,22 @@ nut_version.h: @FORCE_NUT_VERSION@
 	    else \
 	        echo "#define NUT_VERSION_IS_RELEASE 0" ; \
 	    fi ; \
-	 } > "$@.tmp" && \
-	 echo "NUT_VERSION: \"$$NUT_VERSION\"  NUT_VERSION_IS_RELEASE:$$GITREV_IS_RELEASE  NUT_VERSION_SEMVER: \"$$GITREV_SEMVER\""
-	@if test -f "$@" && test -s "$@" ; then \
-		if cmp -s "$@.tmp" "$@" ; then \
+	 } > "$@.tmp.$$$$" && \
+	 echo "NUT_VERSION: \"$$NUT_VERSION\"  NUT_VERSION_IS_RELEASE:$$GITREV_IS_RELEASE  NUT_VERSION_SEMVER: \"$$GITREV_SEMVER\"" && \
+	 if test -f "$@" && test -s "$@" ; then \
+		if cmp -s "$@.tmp.$$$$" "$@" ; then \
 			echo "  GENERATE-HEADER	$@ did not change" ; \
 		else \
 			echo "  GENERATE-HEADER	$@ got changed" ; \
-			cp "$@.tmp" "$@" ; \
+			cp "$@.tmp.$$$$" "$@" ; \
 		fi ; \
 	 else \
 		echo "  GENERATE-HEADER	$@ was absent"; \
-		cp "$@.tmp" "$@" ; \
-	 fi
-	-rm -f "$@.tmp"
+		cp "$@.tmp.$$$$" "$@" ; \
+	 fi \
+	 || RES=$$? ; \
+	 rm -f "$@.tmp.$$$$" ; \
+	 exit $$RES
 
 FORCE: