forked from AFPy/python-docs-fr
make: Don't whine on any commands if ../cpython does not exists.
This commit is contained in:
parent
f5fb08b219
commit
38c21702d9
2
Makefile
2
Makefile
|
@ -59,7 +59,7 @@ todo:
|
||||||
|
|
||||||
.PHONY: merge
|
.PHONY: merge
|
||||||
merge: $(VENV)/bin/sphinx-build
|
merge: $(VENV)/bin/sphinx-build
|
||||||
ifneq "$(shell cd $(CPYTHON_CLONE); git describe --contains --all HEAD)" "$(BRANCH)"
|
ifneq "$(shell cd $(CPYTHON_CLONE) 2>/dev/null && git describe --contains --all HEAD)" "$(BRANCH)"
|
||||||
$(error "You're merging from a different branch")
|
$(error "You're merging from a different branch")
|
||||||
endif
|
endif
|
||||||
(cd $(CPYTHON_CLONE); $(VENV)/bin/sphinx-build -Q -b gettext -D gettext_compact=0 Doc pot/)
|
(cd $(CPYTHON_CLONE); $(VENV)/bin/sphinx-build -Q -b gettext -D gettext_compact=0 Doc pot/)
|
||||||
|
|
Loading…
Reference in New Issue
Block a user