From: Rémi Denis-Courmont <remi@remlab.net>
Date: Sun, 30 Aug 2009 07:51:35 +0000 (+0300)
Subject: Always remove revision.tmp
X-Git-Tag: 1.1.0-ff~3746
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=b11bbdf8c87db717327769a408f97c8bf2139fca;p=vlc

Always remove revision.tmp
---

diff --git a/src/Makefile.am b/src/Makefile.am
index 2d922baa89..888751f976 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -513,8 +513,11 @@ stamp-revision:
 	rm -f -- revision.tmp
 	(git --git-dir="$(top_srcdir)/.git/" describe --tags --long \
 		--always || echo exported) > revision.tmp
-	diff revision.tmp revision.txt >/dev/null 2>&1 || \
-	mv -f -- revision.tmp revision.txt
+	if diff revision.tmp revision.txt >/dev/null; then \
+		rm -f -- revision.tmp; \
+	else \
+		mv -f -- revision.tmp revision.txt; \
+	fi 2>&1
 
 ###############################################################################
 # Unit/regression test