[ecflow] 36/50: now include install

Alastair McKinstry mckinstry at moszumanska.debian.org
Wed Sep 20 15:30:54 UTC 2017


This is an automated email from the git hooks/post-receive script.

mckinstry pushed a commit to branch debian/master
in repository ecflow.

commit 4640ec98b7349812e4fe8d86322809d45b02fd18
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Sat Jul 15 20:44:24 2017 +0100

    now include install
---
 debian/rules | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/debian/rules b/debian/rules
index e867be2..357cebe 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,7 +26,7 @@ CMAKE_COMMON_FLAGS = \
 		-DBOOSTROOT=$(LIBDIR)	\
 		-DENABLE_STATIC_BOOST_LIBS=OFF \
 		-DENABLE_SSL=OFF \
-		-DCMAKE_C_CFLAGS="${CFLAGS} ${LDFLAGS}"  \
+		-DCMAKE_C_CFLAGS="${CFLAGS} ${LDFLAGS}"  
 
 override_dh_auto_clean:
 	dh_auto_clean
@@ -40,21 +40,22 @@ override_dh_auto_configure:
 	for f in ${AUTOGENERATED} ; do \
 		sed -e 's%@ARCH@%${DEB_HOST_MULTIARCH}%g' < debian/$$f.in  > debian/$$f ; \
                 done
-	dh_auto_configure -- --builddirectory=debian/build-py2 \
+	dh_auto_configure --builddirectory=debian/build-py2 -- \
 		${CMAKE_COMMON_FLAGS} \
 		-DPYTHON_MIN_VERSION=2.7 \
 		-DBoost_PYTHON_LIBRARY_RELEASE=$(LIBDIR)/libboost_python-py27.so
-	dh_auto_configure -- --builddirectory=debian/build-py3 \
+	dh_auto_configure --builddirectory=debian/build-py3 -- \
 		${CMAKE_COMMON_FLAGS} \
 		-DPYTHON_MIN_VERSION=${PY3VER} \
 		-DBoost_PYTHON_LIBRARY_RELEASE=$(LIBDIR)/libboost_python-${PY3AB}.so
 
 override_dh_auto_build:
-        dh_auto_build  --builddirectory=debian/build-py2
-        dh_auto_build  --builddirectory=debian/build-py3
+	dh_auto_build  --builddirectory=debian/build-py2
+	dh_auto_build  --builddirectory=debian/build-py3
 
 override_dh_auto_install:
-	dh_auto_install
+	dh_auto_install --builddirectory=debian/build-py2
+	dh_auto_install --builddirectory=debian/build-py3
 	#	Drop the suffixes on scripts ...
 	mv $(DESTDIR)/usr/bin/ecflow_logsvr.sh $(DESTDIR)/usr/bin/ecflow_logsvr
 	mv $(DESTDIR)/usr/bin/ecflow_migrate.py $(DESTDIR)/usr/bin/ecflow_migrate

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ecflow.git



More information about the debian-science-commits mailing list