[med-svn] [mricron] 15/17: Further robustify the build

[Michael Hanke]

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

mih pushed a commit to branch master
in repository mricron.

commit 9eb966db88e3d78640ae580c0ce70ab341e45c93
Author: Michael Hanke <michael.hanke at gmail.com>
Date:   Sun Sep 22 12:13:01 2013 +0200

    Further robustify the build
---
 debian/rules |   22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/debian/rules b/debian/rules
index 6ab608c..63585eb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,32 +9,26 @@
 override_dh_auto_build:
 	# first the non-gui parts
 	cp common/notgui.inc common/isgui.inc
-	lazbuild --build-all dcm2nii/dcm2nii.lpi
+	lazbuild --build-all --pcp=/etc/lazarus dcm2nii/dcm2nii.lpi
 	# intermediate clean
 	find $(CURDIR)/dcm2nii -name '*.o' -delete -o -name '*.ppu' -delete
 	# and now the gui parts
 	cp common/gui.inc common/isgui.inc
-	lazbuild --build-all --ws=gtk2 mricron.lpi
-	lazbuild --build-all --ws=gtk2 dcm2nii/dcm2niigui.lpi
-	lazbuild --build-all --ws=gtk2 npm/npm.lpi
+	lazbuild --build-all --ws=gtk2 --pcp=/etc/lazarus mricron.lpi
+	lazbuild --build-all --ws=gtk2 --pcp=/etc/lazarus dcm2nii/dcm2niigui.lpi
+	lazbuild --build-all --ws=gtk2 --pcp=/etc/lazarus npm/npm.lpi
 	# rename npm to prevent conflict with npm package
 	mv npm/npm npm/mricron-npm
 	# build icon
 	convert iconfinal.ico -resize 32x32 iconfinal.xpm
-	mv iconfinal*.xpm mricron.xpm
-
-override_dh_install:
-	dh_install
-	find debian/mricron-data/usr/share/mricron/ -type f -exec chmod -x {} \;
-
-override_dh_installexamples:
-	dh_installexamples
-	find debian/mricron-doc/usr/share/doc/mricron-doc/examples -type f -exec chmod -x {} \;
+	mv iconfinal-0.xpm mricron.xpm || mv iconfinal.xpm mricron.xpm
 
 # we want immediately useable docs and example data, they are in a dedicated
 # package already
 override_dh_compress:
 	dh_compress -X.voi
+	-find debian/mricron-data/usr/share/mricron/ -type f -exec chmod -x {} \;
+	-find debian/mricron-doc/usr/share/doc/mricron-doc/examples -type f -exec chmod -x {} \;
 
 
 override_dh_clean:
@@ -45,7 +39,7 @@ override_dh_clean:
 	-rm dcm2nii/dcm2nii
 	-rm dcm2nii/dcm2niigui
 	-rm npm/mricron-npm
-	-rm iconfinal-*.xpm mricron.xpm
+	-rm iconfinal*.xpm mricron.xpm
 	-rm text.lrs
 	dh_clean
 

-- 
Alioth's /git/debian-med/git-commit-notice on /srv/git.debian.org/git/debian-med/mricron.git