diff options
| author | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2016-11-21 13:27:46 +0100 |
|---|---|---|
| committer | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2016-11-21 17:04:31 +0100 |
| commit | fab3c9ab472f1044f8aaf5d08f398f08995ba338 (patch) | |
| tree | 0eff2c1cbc928f649b1e5535a8d66f2d15d0c7ab | |
| parent | 6282fbe29bd2a8594bbc589e3996030e882b84f5 (diff) | |
| download | astra-fab3c9ab472f1044f8aaf5d08f398f08995ba338.tar.gz astra-fab3c9ab472f1044f8aaf5d08f398f08995ba338.tar.bz2 astra-fab3c9ab472f1044f8aaf5d08f398f08995ba338.tar.xz astra-fab3c9ab472f1044f8aaf5d08f398f08995ba338.zip | |
Separate python build and install steps
| -rw-r--r-- | build/linux/Makefile.in | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/build/linux/Makefile.in b/build/linux/Makefile.in index 50afc1c..865a936 100644 --- a/build/linux/Makefile.in +++ b/build/linux/Makefile.in @@ -309,14 +309,10 @@ endif ifeq ($(python),yes) py: libastra.la $(MKDIR) python/build - $(MKDIR) python/finalbuild # Note: setting CC to CXX is intentional. Python uses CC for compilation even if input is C++. - cd $(srcdir)/../../python; CXX="${CXX}" CC="${CXX}" CPPFLAGS="${PYCPPFLAGS}" LDFLAGS="${PYLDFLAGS}" $(PYTHON) builder.py build --build-base=$(abs_top_builddir)/python/build install \ - --install-base=$(abs_top_builddir)/python/finalbuild --install-headers=$(abs_top_builddir)/python/finalbuild --install-purelib=$(abs_top_builddir)/python/finalbuild \ - --install-platlib=$(abs_top_builddir)/python/finalbuild --install-scripts=$(abs_top_builddir)/python/finalbuild --install-data=$(abs_top_builddir)/python/finalbuild + cd $(srcdir)/../../python; CXX="${CXX}" CC="${CXX}" CPPFLAGS="${PYCPPFLAGS}" LDFLAGS="${PYLDFLAGS}" $(PYTHON) builder.py build --build-base=$(abs_top_builddir)/python/build -python-root-install: libastra.la - $(MKDIR) python/build +python-root-install: py # Note: setting CC to CXX is intentional. Python uses CC for compilation even if input is C++. cd $(srcdir)/../../python; CXX="${CXX}" CC="${CXX}" CPPFLAGS="${PYCPPFLAGS}" LDFLAGS="${PYLDFLAGS}" $(PYTHON) builder.py build --build-base=$(abs_top_builddir)/python/build install @@ -433,6 +429,11 @@ endif ifeq ($(python),yes) # TODO: This install location doesn't work well for /usr or /usr/local install-python: py + $(MKDIR) python/finalbuild + # Note: setting CC to CXX is intentional. Python uses CC for compilation even if input is C++. + cd $(srcdir)/../../python; CXX="${CXX}" CC="${CXX}" CPPFLAGS="${PYCPPFLAGS}" LDFLAGS="${PYLDFLAGS}" $(PYTHON) builder.py build --build-base=$(abs_top_builddir)/python/build install \ + --install-base=$(abs_top_builddir)/python/finalbuild --install-headers=$(abs_top_builddir)/python/finalbuild --install-purelib=$(abs_top_builddir)/python/finalbuild \ + --install-platlib=$(abs_top_builddir)/python/finalbuild --install-scripts=$(abs_top_builddir)/python/finalbuild --install-data=$(abs_top_builddir)/python/finalbuild $(INSTALL_SH) -m 755 -d @prefix@/python $(INSTALL_SH) -m 755 -d @prefix@/python/astra $(INSTALL_SH) -m 755 -d @prefix@/python/astra/plugins |