[SCM] yafaray/master: debian/rules: simplifying libs structure

[mfv-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 1d07b97774c658a466599ffa6637d413b7252435
Author: Matteo F. Vescovi <m.vescovi at revese.it>
Date:   Sat Sep 17 13:43:15 2011 +0200

    debian/rules: simplifying libs structure
    
    Thanks: Pino Toscano (pino)

diff --git a/debian/rules b/debian/rules
index 27c8b3f..9a0a8af 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,9 +9,9 @@ PY3VERS=$(shell py3versions -drv debian/control)
 
 override_dh_auto_configure:
 	dh_auto_configure -- \
-		-DCMAKE_LIBRARY_PATH=/usr/lib/yafaray \
-		-DCMAKE_INSTALL_RPATH=/usr/lib/yafaray/bin \
-		-DCMAKE_BUILD_TYPE=RELEASE \
+		-DYAF_LIB_DIR="lib/yafaray" \
+		-DCMAKE_INSTALL_RPATH=/usr/lib/yafaray \
+		-DCMAKE_BUILD_TYPE=Release \
 		-DWITH_QT=OFF \
 		-DYAF_PY_VERSION=$(PY3VERS)
 
@@ -19,9 +19,8 @@ override_dh_auto_install:
 	dh_auto_install --buildsystem=cmake --destdir=$(INSTDIR)
 
 override_dh_install:
-	mkdir -p debian/yafaray/usr/lib/yafaray/bin
-	cp -rf $(INSTDIR)/$(CURDIR)/bindings/python/* \
-		debian/yafaray/usr/lib/yafaray/bin
 	dh_install
+	cp -rf $(INSTDIR)/$(CURDIR)/bindings/python/* \
+		debian/yafaray/usr/lib/yafaray
 
 override_dh_pysupport:

-- 
yafaray packaging