[Pkg-javascript-commits] [node-expat] 178/371: Tidy rules file: Group node-waf build routines. Generalize node-related commands. Drop needless environment for node test.

[Jonas Smedegaard]

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

js pushed a commit to branch master
in repository node-expat.

commit 888bf5f01d6e6db57c6818f6499a9254eecf108c
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Fri Jun 22 19:26:45 2012 +0200

    Tidy rules file: Group node-waf build routines. Generalize node-related commands. Drop needless environment for node test.
---
 debian/rules | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/debian/rules b/debian/rules
index 9a2e84d..721cbf2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -38,19 +38,24 @@ DEB_UPSTREAM_TARBALL_MD5 = fd5669799856e52b3d35c55a8795a3c7
 
 DEB_INSTALL_DOCS_$(libpkgname) += README.markdown
 
+# node-waf build routines
+NODE-WAF = NODE_PATH=$(cdbs_curdestdir)usr/lib/nodejs node-waf
+NODE = node
 configure/$(libpkgname):: debian/stamp-node-waf-configure
 debian/stamp-node-waf-configure:
-	NODE_PATH=$(cdbs_curdestdir)/usr/lib/nodejs node-waf configure
+	$(NODE-WAF) configure
 	touch $@
-
 build/$(libpkgname):: debian/stamp-node-waf-build
 debian/stamp-node-waf-build:
-	NODE_PATH=$(cdbs_curdestdir)/usr/lib/nodejs node-waf build
-	$(if $(filter nocheck,$(DEB_BUILD_OPTIONS)),,NODE_PATH=$(cdbs_curdestdir)/usr/lib/nodejs node test.js)
+	$(NODE-WAF) build
+	$(if $(filter nocheck,$(DEB_BUILD_OPTIONS)),,$(NODE) test.js)
 	touch $@
-
 install/$(libpkgname)::
-	NODE_PATH=$(cdbs_curdestdir)/usr/lib/nodejs node-waf install
+	$(NODE-WAF) install
+clean::
+	rm -rf build
+	rm -f .lock-wscript
+	rm -f debian/stamp-node-waf-configure debian/stamp-node-waf-build
 
 # Node modules have an uncommon extension preventing autodetection by
 # dh_shlibdeps, so we do it manually
@@ -58,8 +63,3 @@ binary-strip-IMPL/$(libpkgname)::
 	$(if $(is_debug_package)$(filter nostrip,$(DEB_BUILD_OPTIONS)),,find "$(cdbs_curdestdir)" -name "*.node" -exec strip --remove-section=.comment --remove-section=.note --strip-unneeded {} +)
 binary-predeb-IMPL/$(libpkgname)::
 	find "$(cdbs_curdestdir)" -name "*.node" -exec dpkg-shlibdeps -Tdebian/$(cdbs_curpkg).substvars {} +
-
-clean::
-	rm -rf build
-	rm -f .lock-wscript
-	rm -f debian/stamp-node-waf-configure debian/stamp-node-waf-build

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/node-expat.git