Merge branch 'js/git-version-gen-update'
Build regression fix. * js/git-version-gen-update: GIT-VERSION-GEN: allow it to be run in parallelmaint
commit
3ae35648bf
|
@ -86,11 +86,11 @@ sed -e "s|@GIT_VERSION@|$GIT_VERSION|" \
|
||||||
-e "s|@GIT_BUILT_FROM_COMMIT@|$GIT_BUILT_FROM_COMMIT|" \
|
-e "s|@GIT_BUILT_FROM_COMMIT@|$GIT_BUILT_FROM_COMMIT|" \
|
||||||
-e "s|@GIT_USER_AGENT@|$GIT_USER_AGENT|" \
|
-e "s|@GIT_USER_AGENT@|$GIT_USER_AGENT|" \
|
||||||
-e "s|@GIT_DATE@|$GIT_DATE|" \
|
-e "s|@GIT_DATE@|$GIT_DATE|" \
|
||||||
"$INPUT" >"$OUTPUT"+
|
"$INPUT" >"$OUTPUT".$$+
|
||||||
|
|
||||||
if ! test -f "$OUTPUT" || ! cmp "$OUTPUT"+ "$OUTPUT" >/dev/null
|
if ! test -f "$OUTPUT" || ! cmp "$OUTPUT".$$+ "$OUTPUT" >/dev/null
|
||||||
then
|
then
|
||||||
mv "$OUTPUT"+ "$OUTPUT"
|
mv "$OUTPUT".$$+ "$OUTPUT"
|
||||||
else
|
else
|
||||||
rm "$OUTPUT"+
|
rm "$OUTPUT".$$+
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in New Issue