r13941 - packages/trunk/bullet/debian

[Dmitry Smirnov]

Author: onlyjob-guest
Date: 2013-01-07 17:36:41 +0000 (Mon, 07 Jan 2013)
New Revision: 13941

Modified:
   packages/trunk/bullet/debian/libbullet-dev.install
   packages/trunk/bullet/debian/libbullet2.install
   packages/trunk/bullet/debian/rules
Log:
fixing package build; correct multi-arch installation path.

Modified: packages/trunk/bullet/debian/libbullet-dev.install
===================================================================
--- packages/trunk/bullet/debian/libbullet-dev.install	2013-01-01 19:00:00 UTC (rev 13940)
+++ packages/trunk/bullet/debian/libbullet-dev.install	2013-01-07 17:36:41 UTC (rev 13941)
@@ -1,3 +1,3 @@
 usr/include
 usr/lib/*/*.so
-usr/lib/pkgconfig
+usr/lib/*/pkgconfig

Modified: packages/trunk/bullet/debian/libbullet2.install
===================================================================
--- packages/trunk/bullet/debian/libbullet2.install	2013-01-01 19:00:00 UTC (rev 13940)
+++ packages/trunk/bullet/debian/libbullet2.install	2013-01-07 17:36:41 UTC (rev 13941)
@@ -1 +1 @@
-usr/lib/*.so.*
+usr/lib/*/*.so.*

Modified: packages/trunk/bullet/debian/rules
===================================================================
--- packages/trunk/bullet/debian/rules	2013-01-01 19:00:00 UTC (rev 13940)
+++ packages/trunk/bullet/debian/rules	2013-01-07 17:36:41 UTC (rev 13941)
@@ -6,10 +6,14 @@
 	dh $@ --parallel
 
 override_dh_auto_configure:
-	dh_auto_configure -- -DBUILD_SHARED_LIBS=true -DBUILD_EXTRAS=no -DBUILD_DEMOS=no
+	dh_auto_configure -- \
+            -DBUILD_SHARED_LIBS=true \
+            -DBUILD_EXTRAS=no \
+            -DBUILD_DEMOS=no \
+            -DLIB_SUFFIX=/$(DEB_HOST_MULTIARCH)
 
 override_dh_auto_install:
-	override_dh_auto_install
+	dh_auto_install
 	find debian/tmp -type d -empty -delete
 
 override_dh_compress: