[SCM] Packaging the irrlicht game engine branch, master, updated. upstream/1.5-50-g2ee2f4c

[Christoph Egger]

The following commit has been merged in the master branch:
commit 3919951ff9b644a3f4fc1e829968fed1e9fe2a3f
Author: Christoph Egger <Christoph.Egger at gmx.de>
Date:   Sun Aug 2 23:12:00 2009 +0200

    some more cleanup in rules, use more dh_* tools

diff --git a/debian/irrlicht-dev.install b/debian/irrlicht-dev.install
index 12fc9a4..24a4687 100644
--- a/debian/irrlicht-dev.install
+++ b/debian/irrlicht-dev.install
@@ -1,4 +1,4 @@
-usr/include/*
+include/* usr/include/irrlicht
 usr/lib/lib*.a
 usr/lib/lib*.so
 
diff --git a/debian/rules b/debian/rules
index 8a70cc5..abbbfde 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,7 @@
 # This special exception was added by Craig Small in version 0.37 of dh-make.
 
 # Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+# export DH_VERBOSE=1
 
 
 
@@ -64,16 +64,9 @@ install: build
 	dh_testdir
 	dh_testroot
 	dh_prep
-	dh_installdirs
+	dh_installdirs -pirrlicht-dev -Pdebian/tmp usr/include/irrlicht usr/lib
 
-	mkdir -p $(CURDIR)/debian/tmp/usr/lib
-	mkdir -p $(CURDIR)/debian/tmp/usr/include/irrlicht
-
-#	dh_installdirs -Pdebian/tmp usr/include/irrlicht usr/lib
-
-	$(MAKE) -C source/Irrlicht DESTDIR=$(CURDIR)/debian/irrlicht-dev INSTALL_DIR=$(CURDIR)/debian/irrlicht-dev/usr/lib install
-
-#	cp include/* $(CURDIR)/debian/irrlicht-dev/usr/include/irrlicht
+	$(MAKE) -C source/Irrlicht DESTDIR=$(CURDIR)/debian/tmp INSTALL_DIR=$(CURDIR)/debian/tmp/usr/lib install
 
 
 # Build architecture-independent files here.
@@ -87,7 +80,7 @@ binary-arch: install
 	dh_installchangelogs changes.txt
 	dh_installdocs
 	dh_installexamples
-	dh_install --sourcedir=debian/tmp
+	dh_install
 	dh_installman
 	dh_link -plibirrlicht1 usr/lib/libIrrlicht.so.${version} usr/lib/libIrrlicht.so.${major}
 	dh_strip --dbg-package=libirrlicht1-dbg

-- 
Packaging the irrlicht game engine