added python path change to ns3 and simplified substitution, which is not version dependent
This commit is contained in:
parent
4b028661ab
commit
cd747515ea
2 changed files with 2 additions and 10 deletions
|
@ -14,11 +14,7 @@ if WANT_DOCS
|
||||||
DOCS = doc
|
DOCS = doc
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if PYTHON3
|
PYTHONLIBDIR=$(subst site-packages,dist-packages,$(pythondir))
|
||||||
PYTHONLIBDIR=$(shell echo $(pythondir) | sed -e 's/site-packages/dist-packages/')
|
|
||||||
else
|
|
||||||
PYTHONLIBDIR=$(pythondir)
|
|
||||||
endif
|
|
||||||
|
|
||||||
SUBDIRS = proto $(DOCS)
|
SUBDIRS = proto $(DOCS)
|
||||||
|
|
||||||
|
|
|
@ -9,11 +9,7 @@
|
||||||
|
|
||||||
if WANT_PYTHON
|
if WANT_PYTHON
|
||||||
|
|
||||||
if PYTHON3
|
PYTHONLIBDIR=$(subst site-packages,dist-packages,$(pythondir))
|
||||||
PYTHONLIBDIR=$(libdir)/python3/dist-packages
|
|
||||||
else
|
|
||||||
PYTHONLIBDIR=$(pythondir)
|
|
||||||
endif
|
|
||||||
|
|
||||||
SETUPPY = setup.py
|
SETUPPY = setup.py
|
||||||
SETUPPYFLAGS = -v
|
SETUPPYFLAGS = -v
|
||||||
|
|
Loading…
Add table
Reference in a new issue