git://git.onelab.eu
/
nepi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adding NetNSApplication and test
[nepi.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
039820b
..
24e5b15
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-11,7
+11,11
@@
SUBBUILDDIR = $(shell python -c 'import distutils.util, sys; \
PYTHON25 := $(shell python -c 'import sys; v = sys.version_info; \
print (1 if v[0] <= 2 and v[1] <= 5 else 0)')
PYTHON25 := $(shell python -c 'import sys; v = sys.version_info; \
print (1 if v[0] <= 2 and v[1] <= 5 else 0)')
+ifeq ($(PYTHON25),0)
+BUILDDIR := $(BUILDDIR)/$(SUBBUILDDIR)
+else
BUILDDIR := $(BUILDDIR)/lib
BUILDDIR := $(BUILDDIR)/lib
+endif
PYPATH = $(BUILDDIR):$(TESTLIB):$(PYTHONPATH)
COVERAGE = $(or $(shell which coverage), $(shell which python-coverage), \
PYPATH = $(BUILDDIR):$(TESTLIB):$(PYTHONPATH)
COVERAGE = $(or $(shell which coverage), $(shell which python-coverage), \