[SCM] Yet Another Dynamic Engine. Platform for discrete element modeling. branch, master, updated. upstream/0.60.2-78-ga0cfade

[Anton Gladky]

The following commit has been merged in the master branch:
commit debb671b57f4b70aa21b899fa073e624cc72520e
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Fri Jun 10 23:38:27 2011 +0200

    Change in debian/rules {} on (), where it is necessary.

diff --git a/debian/rules b/debian/rules
index 0475ecb..e1282ca 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,7 @@ tmpDirMatplotLib = $(CURDIR)/debian/matplotlib
 tmpInstall = $(CURDIR)/debian/inst
 tmpInstallDbg = $(CURDIR)/debian/inst-dbg
 export VERSION=$(shell cat VERSION)
-export _VERSION=-${VERSION}
+export _VERSION=-$(VERSION)
 CXXFLAGS := -Wall $(shell dpkg-buildflags --get CXXFLAGS)
 
 %:
@@ -16,16 +16,16 @@ override_dh_auto_clean:
 	rm -rf tags
 	rm -f scons.profile-deb
 	rm -f *.1
-	rm -rf ${tmpDirMatplotLib}
-	rm -rf ${tmpInstall}
-	rm -rf ${tmpInstallDbg}
+	rm -rf $(tmpDirMatplotLib)
+	rm -rf $(tmpInstall)
+	rm -rf $(tmpInstallDbg)
 	find . -name '*.pyc' -print0 | xargs -0 rm -f
 	dh_clean 
 
 override_dh_auto_configure:
-	mkdir -p ${tmpDirMatplotLib}
-	mkdir -p ${tmpInstall}
-	mkdir -p ${tmpInstallDbg}
+	mkdir -p $(tmpDirMatplotLib)
+	mkdir -p $(tmpInstall)
+	mkdir -p $(tmpInstallDbg)
 
 override_dh_auto_build:
 	# remove the profile, if existing, to have clean config
@@ -34,16 +34,16 @@ override_dh_auto_build:
 	-cat /proc/meminfo
 	-cat /proc/cpuinfo
 	# the last argument specified that we only want files in lib installed -- common files (the executable) are already in the optimized package
-	export MPLCONFIGDIR=${tmpDirMatplotLib} HOME=${tmpDirMatplotLib}$ ; NO_SCONS_GET_RECENT= scons profile=deb buildPrefix=debian runtimePREFIX=/usr version=${VERSION} brief=0 chunkSize=2 -j1 features=vtk,gts,opengl,qt4,openmp PREFIX=${tmpInstallDbg} variant='' CXXFLAGS='$(CXXFLAGS)' optimize=0 march= debug=1 ${tmpInstallDbg}/lib
+	export MPLCONFIGDIR=$(tmpDirMatplotLib) HOME=$(tmpDirMatplotLib)$ ; NO_SCONS_GET_RECENT= scons profile=deb buildPrefix=debian runtimePREFIX=/usr version=$(VERSION) brief=0 chunkSize=2 -j1 features=vtk,gts,opengl,qt4,openmp PREFIX=$(tmpInstallDbg) variant='' CXXFLAGS='$(CXXFLAGS)' optimize=0 march= debug=1 $(tmpInstallDbg)/lib
 	#optimized build
-	export MPLCONFIGDIR=${tmpDirMatplotLib} HOME=${tmpDirMatplotLib} ; NO_SCONS_GET_RECENT= scons profile=deb PREFIX=${tmpInstall} variant=''  -j1 optimize=1 debug=0
+	export MPLCONFIGDIR=$(tmpDirMatplotLib) HOME=$(tmpDirMatplotLib) ; NO_SCONS_GET_RECENT= scons profile=deb PREFIX=$(tmpInstall) variant=''  -j1 optimize=1 debug=0
 	# generate manpages
-	export MPLCONFIGDIR=${tmpDirMatplotLib} HOME=${tmpDirMatplotLib} ; YADE_PREFIX=${tmpInstall} ${tmpInstall}/bin/yade${_VERSION} --debug --generate-manpage yade${_VERSION}.1
-	export MPLCONFIGDIR=${tmpDirMatplotLib} HOME=${tmpDirMatplotLib} ; YADE_PREFIX=${tmpInstall} ${tmpInstall}/bin/yade${_VERSION}-batch --debug --generate-manpage yade${_VERSION}-batch.1
+	export MPLCONFIGDIR=$(tmpDirMatplotLib) HOME=$(tmpDirMatplotLib) ; YADE_PREFIX=$(tmpInstall) $(tmpInstall)/bin/yade$(_VERSION) --debug --generate-manpage yade$(_VERSION).1
+	export MPLCONFIGDIR=$(tmpDirMatplotLib) HOME=$(tmpDirMatplotLib) ; YADE_PREFIX=$(tmpInstall) $(tmpInstall)/bin/yade$(_VERSION)-batch --debug --generate-manpage yade$(_VERSION)-batch.1
 
 override_dh_auto_test:
-	export MPLCONFIGDIR=${tmpDirMatplotLib} HOME=${tmpDirMatplotLib} ; YADE_PREFIX=${tmpInstallDbg} ${tmpInstall}/bin/yade${_VERSION} --debug --test
-	export MPLCONFIGDIR=${tmpDirMatplotLib} HOME=${tmpDirMatplotLib} ; YADE_PREFIX=${tmpInstall} ${tmpInstall}/bin/yade${_VERSION} --test
+	export MPLCONFIGDIR=$(tmpDirMatplotLib) HOME=$(tmpDirMatplotLib) ; YADE_PREFIX=$(tmpInstallDbg) $(tmpInstall)/bin/yade$(_VERSION) --debug --test
+	export MPLCONFIGDIR=$(tmpDirMatplotLib) HOME=$(tmpDirMatplotLib) ; YADE_PREFIX=$(tmpInstall) $(tmpInstall)/bin/yade$(_VERSION) --test
 	#Delete all pyc files
 	find . -name '*.pyc' -print0 | xargs -0 rm -f
 
@@ -51,10 +51,10 @@ override_dh_installchangelogs:
 	dh_installchangelogs ChangeLog
 
 override_dh_installman:
-	dh_installman -p yade${_VERSION} yade${_VERSION}.1 yade${_VERSION}-batch.1
+	dh_installman -p yade$(_VERSION) yade$(_VERSION).1 yade$(_VERSION)-batch.1
 
 override_dh_strip:
-	dh_strip --exclude=yade${_VERSION}-dbg   # don't strip the debug package
+	dh_strip --exclude=yade$(_VERSION)-dbg   # don't strip the debug package
 
 override_dh_compress:
 	dh_compress --all -X.py -X.stl -X.gts -X.geo -X.mesh -X.msh -X.pdf -X.png -X.svg -X.txt -X.js -X.inv
@@ -62,7 +62,7 @@ override_dh_compress:
 binary-indep: 
 	dh --until dh_auto_build $@
 	#Generate docs
-	export MPLCONFIGDIR=${tmpDirMatplotLib} HOME=${tmpDirMatplotLib} ; cd doc/sphinx; PYTHONPATH=. YADE_PREFIX=${tmpInstall} ${tmpInstall}/bin/yade${_VERSION} yadeSphinx.py; cd _build/latex; xelatex Yade.tex; xelatex Yade.tex; xelatex Yade.tex; cd ../..;
+	export MPLCONFIGDIR=$(tmpDirMatplotLib) HOME=$(tmpDirMatplotLib) ; cd doc/sphinx; PYTHONPATH=. YADE_PREFIX=$(tmpInstall) $(tmpInstall)/bin/yade$(_VERSION) yadeSphinx.py; cd _build/latex; xelatex Yade.tex; xelatex Yade.tex; xelatex Yade.tex; cd ../..;
 	dh --after dh_auto_build $@
 	
 binary-arch: 

-- 
Yet Another Dynamic Engine. Platform for discrete element modeling.