diff options
| author | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2016-11-22 17:30:08 +0100 |
|---|---|---|
| committer | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2016-11-22 17:30:08 +0100 |
| commit | 19e79122e3f58f22e96a003cc494e38ff255bb0d (patch) | |
| tree | 19bf014f8a021002e31315e358cd9d7cd65404b7 | |
| parent | bbda2ad4d12a839701737a98e210cef489d62177 (diff) | |
| download | astra-19e79122e3f58f22e96a003cc494e38ff255bb0d.tar.gz astra-19e79122e3f58f22e96a003cc494e38ff255bb0d.tar.bz2 astra-19e79122e3f58f22e96a003cc494e38ff255bb0d.tar.xz astra-19e79122e3f58f22e96a003cc494e38ff255bb0d.zip | |
Rename python-root-install to install-python-site-packages
| -rw-r--r-- | build/linux/Makefile.in | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/build/linux/Makefile.in b/build/linux/Makefile.in index d248947..0ca136a 100644 --- a/build/linux/Makefile.in +++ b/build/linux/Makefile.in @@ -421,7 +421,7 @@ install-libraries: libastra.la ifeq ($(install_type),prefix) # libraries into @libdir@, python into site-packages, mex into @datadir@ -install: install-libraries install-matlab python-root-install install-octave +install: install-libraries install-matlab install-python-site-packages install-octave PYPKGDATA= MATLABBASE=@datadir@/astra/matlab @@ -442,7 +442,7 @@ ifeq ($(install_type),module) # python into site-packages, mex into @datadir@ # library copied into python/mex directories # modules built with rpath=$ORIGIN -install: install-matlab python-root-install install-octave +install: install-matlab install-python-site-packages install-octave PYPKGDATA=$(SONAME) MATLABBASE=@prefix@/matlab @@ -478,11 +478,11 @@ install-python: py $(INSTALL_SH) -m 644 python/finalbuild/*.egg-info @prefix@/python/ # TODO: docs -python-root-install: py +install-python-site-packages: py # Note: setting CC to CXX is intentional. Python uses CC for compilation even if input is C++. cd $(srcdir)/../../python; ASTRA_INSTALL_LIBRARY_AS_DATA=$(PYPKGDATA) CXX="${CXX}" CC="${CXX}" CPPFLAGS="${PYCPPFLAGS}" LDFLAGS="${PYLDFLAGS}" $(PYTHON) builder.py build --build-base=$(abs_top_builddir)/python/build install else -python-root-install: +install-python-site-packages: install-python: endif @@ -523,7 +523,7 @@ $(srcdir)/configure: $(srcdir)/configure.ac @echo "configure.ac has been changed. Regenerating configure script" cd $(srcdir) && $(SHELL) ./autogen.sh -.PHONY: all mex test clean distclean install install-libraries py python-root-install install-python install-octave install-matlab-so install-octave-so +.PHONY: all mex test clean distclean install install-libraries py install-python-site-packages install-python install-octave install-matlab-so install-octave-so # don't remove intermediate files: .SECONDARY: |