[lua-torch-torch7] 06/11: rules: elegant configure

[Zhou Mo]

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

cdluminate-guest pushed a commit to branch master
in repository lua-torch-torch7.

commit 657e411d1bda83c8369a5b4b654c39c02c28e578
Author: Zhou Mo <cdluminate at gmail.com>
Date:   Sat Sep 10 04:16:59 2016 +0000

    rules: elegant configure
---
 debian/changelog |  1 +
 debian/rules     | 13 +++++++------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 74b18a3..d9438ea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ lua-torch-torch7 (0~20160908-ge5ebac6-1) UNRELEASED; urgency=medium
     - fix-32bit-system-abs-failure
     - TH-cmake-add-version
     - luaT-cmake-add-version
+  * Use elegant dh_auto_configure instead of hardcoded commands.
 
  -- Zhou Mo <cdluminate at gmail.com>  Sat, 10 Sep 2016 03:25:56 +0000
 
diff --git a/debian/rules b/debian/rules
index 346bcba..260a04a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -29,14 +29,14 @@ TORCH_FLAGS_5_1= \
 
 override_dh_auto_configure:
 	ln -s . torch
-	# configure libTH.so
-	set -e; if ! test -d TH.build; then mkdir TH.build; fi
-	set -e; cd TH.build; cmake ../lib/TH $(TORCH_FLAGS_5_1) \
-		-DTorch_INSTALL_CMAKE_SUBDIR=/usr/share/libtorch-th-dev/
 	# configure libluaT.so
-	set -e; if ! test -d luaT.build; then mkdir luaT.build; fi
-	set -e; cd luaT.build; cmake ../lib/luaT $(TORCH_FLAGS_5_1) \
+	dh_auto_configure --buildsystem=cmake --builddirectory=luaT.build -- \
+		../lib/luaT $(TORCH_FLAGS_5_1) \
 		-DTorch_INSTALL_CMAKE_SUBDIR=/usr/share/libtorch-luat-dev/
+	# configure libTH.so
+	dh_auto_configure --buildsystem=cmake --builddirectory=TH.build -- \
+		../lib/TH $(TORCH_FLAGS_5_1) \
+		-DTorch_INSTALL_CMAKE_SUBDIR=/usr/share/libtorch-th-dev/
 	# configure the rest lua stuff
 	dh_auto_configure --buildsystem=lua
 	# generate random.c and TensorMath.c
@@ -79,6 +79,7 @@ override_dh_auto_install:
 	dh_auto_install --buildsystem=lua
 
 override_dh_compress:
+	# don't compress documents used by lua-torch-dok
 	dh_compress -X.md
 
 override_dh_shlibdeps:

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