[yade] 01/02: Let build-indep target be built.

[Anton Gladky]

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

gladk pushed a commit to branch master
in repository yade.

commit 672fa7af439a825ea39de506149ae13e3070322f
Author: Anton Gladky <gladk at debian.org>
Date:   Sun Aug 10 08:31:18 2014 +0200

    Let build-indep target be built.
---
 debian/rules | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/debian/rules b/debian/rules
index f02f55a..23967d8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,6 +20,9 @@ ifneq (,$(filter $(DEB_HOST_ARCH), armel armhf hurd-i386 mips mipsel))
 	export DEB_CXXFLAGS_MAINT_APPEND = --param ggc-min-expand=20 --param ggc-min-heapsize=128000
 endif
 
+# Check, whether Build-Depends-Indep are installed
+BUILD_DOC=$(shell dpkg -s python-sphinx | grep -q "^Status:.* installed$$" && echo yes)
+
 export MPLCONFIGDIR := $(tmpDirMatplotLib) 
 export HOME := $(tmpDirMatplotLib) 
 export LD_LIBRARY_PATH :=  $(tmpInstall)/usr/lib/$(DEB_HOST_MULTIARCH)/yade/py:$(tmpInstall)/usr/lib/$(DEB_HOST_MULTIARCH)/yade:$(tmpInstall)/usr/lib/$(DEB_HOST_MULTIARCH)/yade/py:$(tmpInstall)/usr/lib/$(DEB_HOST_MULTIARCH)/yade/py/gts:$(tmpInstall)/usr/lib/$(DEB_HOST_MULTIARCH)/yade/py/yade:$(tmpInstall)/usr/lib/$(DEB_HOST_MULTIARCH)/yade/py/yade/qt:$(LD_LIBRARY_PATH); 
@@ -40,16 +43,20 @@ override_dh_auto_configure:
 	-cat /proc/meminfo
 	-cat /proc/cpuinfo
 
-override_dh_auto_install-arch:
-	dh_auto_install -a
+override_dh_auto_install:
+	dh_auto_install
 	# generate manpages
 	help2man $(tmpInstall)/usr/bin/yade > yade.1
 	help2man $(tmpInstall)/usr/bin/yade-batch > yade-batch.1
 	$(tmpInstall)/usr/bin/yade --test
 	$(tmpInstall)/usr/bin/yade --check
+	dh_numpy
+ifeq ($(BUILD_DOC), yes)
+	#Generate docs
+	cd $(CURDIR)/doc/sphinx; PYTHONPATH=. $(tmpInstall)/usr/bin/yade yadeSphinx.py; cd _build/latex; xelatex Yade.tex; xelatex Yade.tex; xelatex Yade.tex;
+endif
 	#Delete all pyc files
 	find . -name '*.pyc' -print0 | xargs -0 rm -f
-	dh_numpy
 
 override_dh_installchangelogs:
 	dh_installchangelogs ChangeLog
@@ -60,17 +67,13 @@ override_dh_installman:
 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
 
-override_dh_auto_install-indep: 
-	#Generate docs
-	cd $(CURDIR)/doc/sphinx; PYTHONPATH=. $(tmpInstall)/usr/bin/yade yadeSphinx.py; cd _build/latex; xelatex Yade.tex; xelatex Yade.tex; xelatex Yade.tex;
-	#Delete all pyc files
-	find . -name '*.pyc' -print0 | xargs -0 rm -f
-
 override_dh_auto_test: 
 
-override_dh_installdocs-indep:
+override_dh_installdocs:
 	dh_installdocs
+ifeq ($(BUILD_DOC), yes)
 	dh_sphinxdoc
+endif
 
 override_dh_auto_clean:
 	dh_auto_clean

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