[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - Makefile.in

[Michael Stahl]

 Makefile.in |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 7b72143ef48df465fb25370ccb680c4601585730
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Jul 27 13:18:11 2017 +0200

    Makefile: fix fetching for the build platform
    
    The invocation of make fetch added in commit
    fe3fb5ecd3b66e32cc5aa64a2afffa572353740e didn't do anything because
    the force-restart didn't actually restart make because it touched
    "Makefile" but the make read "$(BUILDDIR)/Makefile", and make isn't
    smart enough to notice those are the same.
    
    Change-Id: I85cbcba3bf9c3c7b89d4ee33f772820d19542f4a
    Reviewed-on: https://gerrit.libreoffice.org/40482
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    (cherry picked from commit 1176ae51154c2298b44427270754d2ee1562a115)
    Reviewed-on: https://gerrit.libreoffice.org/40494
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/Makefile.in b/Makefile.in
index 037cb5dce95b..e54f43cb6d76 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -30,8 +30,11 @@ GIT_BUILD := $(if $(wildcard $(SRCDIR)/.git),T)
 #    need updated configuration
 ifeq (,$(MAKE_RESTARTS)$(if $(GIT_BUILD),,T)$(if $(filter-out help showmodules clean distclean,$(MAKECMDGOALS)),,T))
 
+# note: this must touch both Makefile and $(BUILDDIR)/Makefile, because make
+# may be invoked using either of these paths, and it will restart itself only
+# if the updated target is exactly the same path as the Makefile it is using
 .PHONY : force-restart
-Makefile: $(BUILDDIR)/config_host.mk $(BUILDDIR)/config_host_lang.mk force-restart
+Makefile $(BUILDDIR)/Makefile: $(BUILDDIR)/config_host.mk $(BUILDDIR)/config_host_lang.mk force-restart
 	@touch $@
 
 # run configure in an environment not polluted by config_host.mk