]> git.ipfire.org Git - thirdparty/krb5.git/commitdiff
Fix race in util/profile/Makefile.in
authorGreg Hudson <ghudson@mit.edu>
Thu, 17 Oct 2013 18:02:14 +0000 (14:02 -0400)
committerTom Yu <tlyu@mit.edu>
Mon, 21 Jul 2014 22:21:14 +0000 (18:21 -0400)
$(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

src/util/profile/Makefile.in

index f1418fb7fe8bf58d91d0a7a1971f9e01169c29c6..79ea610c5b8522da83d86d1ed408d9fe581d484a 100644 (file)
@@ -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