From: Greg Hudson <ghudson@mit.edu>
Date: Thu, 17 Oct 2013 18:02:14 +0000 (-0400)
Subject: Fix race in util/profile/Makefile.in
X-Git-Tag: krb5-1.12.2-final~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=106f45c07139956167d54aacf1674912d3ef3ced;p=thirdparty%2Fkrb5.git

Fix race in util/profile/Makefile.in

$(BUILDTOP)/include/profile.h was being updated by two different
rules, which could collide with make -j.  Use a dependency from
includes instead of a redundant rule.

(cherry picked from commit 4d3827ac1b0e9e6447a132c57f3e2d74d3dfe8a9)

ticket: 7967
version_fixed: 1.12.2
status: resolved
---

diff --git a/src/util/profile/Makefile.in b/src/util/profile/Makefile.in
index f1418fb7fe..79ea610c5b 100644
--- a/src/util/profile/Makefile.in
+++ b/src/util/profile/Makefile.in
@@ -62,13 +62,7 @@ generate-files-mac: profile.h
 $(PROFILE_HDR):: profile.h
 	$(CP) profile.h "$@"
 
-includes:: profile.h
-	if cmp profile.h \
-	$(BUILDTOP)/include/profile.h >/dev/null 2>&1; then :; \
-	else \
-		(set -x; $(RM) $(BUILDTOP)/include/profile.h; \
-		 $(CP) profile.h $(BUILDTOP)/include/profile.h) ; \
-	fi
+includes:: $(PROFILE_HDR)
 
 clean-unix::
 	$(RM) $(BUILDTOP)/include/profile.h test2.ini test3.ini test2.ini.bak