diff --git a/Makefile b/Makefile index 1ac7e197..eb18e037 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ VIRTUALENV = virtualenv --python=python3 SPHINX_BUILDDIR = docs/_build -VENV := $(shell echo $${VIRTUAL_ENV-.venv}) +VENV := $(shell realpath $${VIRTUAL_ENV-.venv}) PYTHON = $(VENV)/bin/python3 DEV_STAMP = $(VENV)/.dev_env_installed.stamp DOC_STAMP = $(VENV)/.doc_env_installed.stamp @@ -8,7 +8,7 @@ INSTALL_STAMP = $(VENV)/.install.stamp TEMPDIR := $(shell mktemp -d) all: install -install: $(INSTALL_STAMP) +install: virtualenv $(INSTALL_STAMP) $(INSTALL_STAMP): $(VENV)/bin/pip install -U pip $(VENV)/bin/pip install -r requirements.txt @@ -23,8 +23,8 @@ $(DEV_STAMP): $(PYTHON) dev-requirements.txt $(VENV)/bin/pip install -Ur dev-requirements.txt touch $(DEV_STAMP) -serve: $(INSTALL_STAMP) - cd budget; ../$(PYTHON) run.py +serve: install + cd budget; $(PYTHON) run.py test: $(DEV_STAMP) $(VENV)/bin/tox @@ -37,3 +37,6 @@ build-requirements: $(TEMPDIR)/bin/pip install -U pip $(TEMPDIR)/bin/pip install -Ue "." $(TEMPDIR)/bin/pip freeze | grep -v -- '-e' > requirements.txt + +clean: + rm -rf .venv