Makefile.in | 2 ++
1 file changed, 2 insertions(+)
New commits:
commit e6d2332eae92b8f288d3d3f8aa2090abfa777098
Author: jan Iversen <j...@libreoffice.org>
Date: Sun Mar 11 12:27:43 2018 +0100
Allow use of "git worktree" in Makefile.in
When using git worktree $(SRCDIR)/.git is a file and not a directory,
therefore
get-submodules: fails in "./g -z".
Eliminating call to "./g -z" in worktree directories, but keeping it in the
cloned directory.
Change-Id: I88d8e3e06cac2a2710da21ae233364d8119fe5ef
diff --git a/Makefile.in b/Makefile.in
index 470c6956cc0e..0b2340a0ef58 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -241,7 +241,9 @@ get-submodules:
ifneq ($(foreach i,$(GIT_NEEDED_SUBMODULES),$(i)/.git),$(wildcard $(foreach
i,$(GIT_NEEDED_SUBMODULES),$(i)/.git)))
cd $(SRCDIR) && ./g -f clone
endif
+ifeq ($(shell test -d $(SRCDIR)/.git; echo $$?),0)
@cd $(SRCDIR) && ./g -z # make sure the git hooks are in place even if
no submodules are needed
+endif
else # these sources are from a tarball, so get the other source tarballs
gb_LO_VER := $(shell . $(SRCDIR)/sources.ver && echo $$lo_sources_ver)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
