Thevenel/python-docs-fr
1
0
Fork 0
forked from AFPy/python-docs-fr
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make: Don't whine on any commands if ../cpython does not exists.

Browse Source
This commit is contained in:
Julien Palard 2017-10-13 23:07:23 +02:00
parent f5fb08b219
commit 38c21702d9
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -59,7 +59,7 @@ todo:
.PHONY: merge
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")
endif
(cd $(CPYTHON_CLONE); $(VENV)/bin/sphinx-build -Q -b gettext -D gettext_compact=0 Doc pot/)