Skip to content

Commit

Permalink
Merge pull request #12314 from gabrielmougard/fix/pip-in-makefile
Browse files Browse the repository at this point in the history
makefile: use venv pip and not global pip
  • Loading branch information
tomponline authored Sep 25, 2023
2 parents b8564e4 + af2a393 commit 8bb5dc0
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ TAG_SQLITE3=$(shell printf "$(HASH)include <dqlite.h>\nvoid main(){dqlite_node_i
GOPATH ?= $(shell go env GOPATH)
CGO_LDFLAGS_ALLOW ?= (-Wl,-wrap,pthread_create)|(-Wl,-z,now)
SPHINXENV=doc/.sphinx/venv/bin/activate
SPHINXPIPPATH=doc/.sphinx/venv/bin/pip

ifneq "$(wildcard vendor)" ""
RAFT_PATH=$(CURDIR)/vendor/raft
Expand Down Expand Up @@ -125,7 +126,7 @@ doc-setup: client
. $(SPHINXENV) ; pip install --require-virtualenv --upgrade -r doc/.sphinx/requirements.txt --log doc/.sphinx/venv/pip_install.log
@test ! -f doc/.sphinx/venv/pip_list.txt || \
mv doc/.sphinx/venv/pip_list.txt doc/.sphinx/venv/pip_list.txt.bak
@pip list --local --format=freeze > doc/.sphinx/venv/pip_list.txt
$(SPHINXPIPPATH) list --local --format=freeze > doc/.sphinx/venv/pip_list.txt
find doc/reference/manpages/ -name "*.md" -type f -delete
rm -Rf doc/html
rm -Rf doc/.sphinx/.doctrees
Expand Down

0 comments on commit 8bb5dc0

Please sign in to comment.