StealthOS/subiquity
StealthOS
/
subiquity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #342 from smoser/cleanup/makefile-pythonpath 

Makefile: Always put PYTHONPATH into environment
This commit is contained in:
Michael Hudson-Doyle 2018-05-25 09:14:07 +12:00 committed by GitHub
parent ae94db26ac d71cb7cadf
commit dce672609a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -6,6 +6,7 @@ PYTHONSRC=$(NAME)
PYTHONPATH=$(shell pwd):$(shell pwd)/probert
PROBERTDIR=./probert
PROBERT_REPO=https://github.com/CanonicalLtd/probert
export PYTHONPATH
ifneq (,$(MACHINE))
MACHARGS=--machine=$(MACHINE)
@ -28,10 +29,10 @@ dryrun: probert i18n
$(MAKE) ui-view DRYRUN="--dry-run --uefi"
ui-view:
(PYTHONPATH=$(PYTHONPATH) bin/$(PYTHONSRC)-tui $(DRYRUN) $(MACHARGS))
(bin/$(PYTHONSRC)-tui $(DRYRUN) $(MACHARGS))
ui-view-serial:
(TERM=att4424 PYTHONPATH=$(PYTHONPATH) bin/$(PYTHONSRC)-tui $(DRYRUN) --serial)
(TERM=att4424 bin/$(PYTHONSRC)-tui $(DRYRUN) --serial)
lint:
echo "Running flake8 lint tests..."