strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Allow use of "git worktree" in Makefile.in

Browse source 
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
This commit is contained in:
jan Iversen 2018-03-11 12:27:43 +01:00
parent 82d9af7f14
commit e6d2332eae
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile.in
View file

@ -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)