[adios] 120/207: Fix quoting
Alastair McKinstry
mckinstry at moszumanska.debian.org
Fri Jun 12 06:04:46 UTC 2015
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch master
in repository adios.
commit 1c6e191bf4bbf9d3bfa7d7bca7d8ca37a1933ef1
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Mon May 19 15:46:52 2014 +0100
Fix quoting
---
debian/rules | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/debian/rules b/debian/rules
index 3f06948..61d6d87 100755
--- a/debian/rules
+++ b/debian/rules
@@ -64,24 +64,24 @@ override_dh_auto_configure:
dh_auto_configure -- $(WITH_LUSTRE) --enable-shared \
--with-hdf5=/usr --with-bzip2=/usr --prefix=$(DESTDIR) MPIFC=mpif77 CC=$(CC) CFLAGS='-fPIC'
# Prep python wrapper. Cache these for cmake otherwise it will get 2.7, 3.* confused
- mkdir -p wrappers/numpy/build_$PY2
- echo "PYTHON_EXECUTABLE:FILEPATH=/usr/bin/python" > wrappers/numpy/build_$PY2/CMakeCache.txt
- echo "PYTHON_INCLUDE_DIR:PATH=/usr/include/python2.7" >> wrappers/numpy/build_$PY2/CMakeCache.txt
- echo "PYTHON_INCLUDE_DIR2:PATH=/usr/include/$(DEB_HOST_MULTIARCH)/$(PY2)" >> wrappers/numpy/build_$PY2/CMakeCache.txt
- echo "PYTHON_LIBRARY:FILEPATH=/usr/lib/$(DEB_HOST_MULTIARCH)/lib$(PY2).so" >> wrappers/numpy/build_$PY2/CMakeCache.txt
- echo "CMAKE_CXX_COMPILER:FILEPATH=/usr/bin/$(CXX)" >> wrappers/numpy/build_$PY2/CMakeCache.txt
- echo "ADIOS_COMPILE_FLAGS:STRING=-fPIC " >> wrappers/numpy/build_$PY2/CMakeCache.txt
- echo "wrappers/numpy/builds_$PY2/adios.so /usr/lib/$(PY2)/dist-packages/adios
+ mkdir -p wrappers/numpy/build_$(PY2)
+ echo "PYTHON_EXECUTABLE:FILEPATH=/usr/bin/python" > wrappers/numpy/build_$(PY2)/CMakeCache.txt
+ echo "PYTHON_INCLUDE_DIR:PATH=/usr/include/$(PY2)" >> wrappers/numpy/build_$(PY2)/CMakeCache.txt
+ echo "PYTHON_INCLUDE_DIR2:PATH=/usr/include/$(DEB_HOST_MULTIARCH)/$(PY2)" >> wrappers/numpy/build_$(PY2)/CMakeCache.txt
+ echo "PYTHON_LIBRARY:FILEPATH=/usr/lib/$(DEB_HOST_MULTIARCH)/lib$(PY2).so" >> wrappers/numpy/build_$(PY2)/CMakeCache.txt
+ echo "CMAKE_CXX_COMPILER:FILEPATH=/usr/bin/$(CXX)" >> wrappers/numpy/build_$(PY2)/CMakeCache.txt
+ echo "ADIOS_COMPILE_FLAGS:STRING=-fPIC " >> wrappers/numpy/build_$(PY2)/CMakeCache.txt
+ echo "wrappers/numpy/builds_$(PY2)/adios.so /usr/lib/$(PY2)/dist-packages/adios
# And repeat for python3*
for p in $(PY3VERS) ; do \
mkdir -p wrappers/numpy/build_$$p ; \
echo "PYTHON_EXECUTABLE:FILEPATH=/usr/bin/python" > wrappers/numpy/builds_$$(p)/CMakeCache.txt ;\
echo "PYTHON_INCLUDE_DIR:PATH=/usr/include/$$(p)" >> wrappers/numpy/build_$$(p)/CMakeCache.txt ;\
- echo "PYTHON_INCLUDE_DIR2:PATH=/usr/include/$(DEB_HOST_MULTIARCH)/$$(p)" >> wrappers/numpy/builds_$$p/CMakeCache.txt ;\
- echo "PYTHON_LIBRARY:FILEPATH=/usr/lib/$(DEB_HOST_MULTIARCH)/lib$$(p)m.so" >> wrappers/numpy/build_$$p/CMakeCache.txt ;\
- echo "CMAKE_CXX_COMPILER:FILEPATH=/usr/bin/$(CXX)" >> wrappers/numpy/build_$pp/CMakeCache.txt ;\
- echo "ADIOS_COMPILE_FLAGS:STRING=-fPIC " >> wrappers/numpy/build_$pp/CMakeCache.txt ;\
- echo "wrappers/numpy/build_$$p/adios.so /usr/lib/python3/dist-packages/adios" >> debian/python3-adios.install ; \
+ echo "PYTHON_INCLUDE_DIR2:PATH=/usr/include/$(DEB_HOST_MULTIARCH)/$$(p)" >> wrappers/numpy/build_$$(p)/CMakeCache.txt ;\
+ echo "PYTHON_LIBRARY:FILEPATH=/usr/lib/$(DEB_HOST_MULTIARCH)/lib$$(p)m.so" >> wrappers/numpy/build_$$(p)/CMakeCache.txt ;\
+ echo "CMAKE_CXX_COMPILER:FILEPATH=/usr/bin/$(CXX)" >> wrappers/numpy/build_$$(p)/CMakeCache.txt ;\
+ echo "ADIOS_COMPILE_FLAGS:STRING=-fPIC " >> wrappers/numpy/build_$$(p)/CMakeCache.txt ;\
+ echo "wrappers/numpy/build_$$(p)/adios.so /usr/lib/python3/dist-packages/adios" >> debian/python3-adios.install ; \
done
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/adios.git
More information about the debian-science-commits
mailing list