Skip to content
This repository has been archived by the owner on Oct 13, 2021. It is now read-only.

Commit

Permalink
Merge pull request #537 from abbeyj/virtual-env-make-variable
Browse files Browse the repository at this point in the history
Use $(VIRTUAL_ENV) consistently instead of $$VIRTUAL_ENV in the makef…
  • Loading branch information
erikrose committed May 11, 2016
2 parents 7302c56 + d6898d0 commit 8c90e7c
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
all: static plugins requirements .dxr_installed

test: all
$$VIRTUAL_ENV/bin/pip install nose
$$VIRTUAL_ENV/bin/nosetests -v --nologcapture
$(VIRTUAL_ENV)/bin/pip install nose
$(VIRTUAL_ENV)/bin/nosetests -v --nologcapture

clean: static_clean
rm -rf tooling/node/node_modules/.bin/nunjucks-precompile \
Expand All @@ -29,12 +29,12 @@ static_clean:
static: dxr/static_manifest

docs: requirements .dxr_installed
$$VIRTUAL_ENV/bin/pip install Sphinx==1.3.1
$(VIRTUAL_ENV)/bin/pip install Sphinx==1.3.1
$(MAKE) -C docs html

# Install dev conveniences:
dev:
$$VIRTUAL_ENV/bin/pip install pdbpp nose-progressive
$(VIRTUAL_ENV)/bin/pip install pdbpp nose-progressive


## Conveniences to run from your host machine if running DXR in Docker:
Expand Down Expand Up @@ -86,9 +86,9 @@ $(VIRTUAL_ENV)/bin/activate:
# environment.
.dxr_installed: $(VIRTUAL_ENV)/bin/activate setup.py
ifeq ($(DXR_PROD),1)
$$VIRTUAL_ENV/bin/pip install --no-deps .
$(VIRTUAL_ENV)/bin/pip install --no-deps .
else
$$VIRTUAL_ENV/bin/pip install --no-deps -e .
$(VIRTUAL_ENV)/bin/pip install --no-deps -e .
endif
touch $@

Expand All @@ -111,7 +111,7 @@ dxr/static_unhashed/js/templates.js: dxr/templates/nunjucks/*.html \

# Install requirements in current virtualenv:
.peep_installed: requirements.txt
$$VIRTUAL_ENV/bin/python tooling/peep.py install -r requirements.txt
$(VIRTUAL_ENV)/bin/python tooling/peep.py install -r requirements.txt
touch $@

# Static-file cachebusting:
Expand Down

0 comments on commit 8c90e7c

Please sign in to comment.