[SCM] qtruby packaging branch, master, updated. ba41c08e91fc252d7f0bbfff49e28e8e48290142

[Pino Toscano]

The following commit has been merged in the master branch:
commit e67c3b9acaca04b76921ae0a35673c0520d36e89
Author: Pino Toscano <pino at debian.org>
Date:   Sun Aug 14 17:03:25 2011 +0200

    take the ruby path install way from kdebindings
    
    instead of patch the CMakeLists.txt changing variable to use, pass ourselves the paths where we want to install ruby module (as kdebindings did)
---
 debian/patches/install_to_usr.diff |   14 --------------
 debian/patches/series              |    1 -
 debian/rules                       |   11 +++++++++--
 3 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/debian/patches/install_to_usr.diff b/debian/patches/install_to_usr.diff
deleted file mode 100644
index 917efb6..0000000
--- a/debian/patches/install_to_usr.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-Install to /usr not /usr/local
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -31,8 +31,8 @@ if (NOT COMPILE_RUBY)
-     return()
- endif (NOT COMPILE_RUBY)
- 
--SET(CUSTOM_RUBY_SITE_ARCH_DIR ${RUBY_SITEARCH_DIR} CACHE DIR "custom installation directory for ruby binary extension" )
--SET(CUSTOM_RUBY_SITE_LIB_DIR ${RUBY_SITELIB_DIR} CACHE DIR "custom installation directory for ruby extension" )
-+SET(CUSTOM_RUBY_SITE_ARCH_DIR ${RUBY_ARCH_DIR} CACHE DIR "custom installation directory for ruby binary extension" )
-+SET(CUSTOM_RUBY_SITE_LIB_DIR ${RUBY_RUBY_LIB_DIR} CACHE DIR "custom installation directory for ruby extension" )
- 
- # compute an overall version number which can be compared at once
- MATH(EXPR RUBY_VERSION_NUMBER "${RUBY_VERSION_MAJOR}*10000 + ${RUBY_VERSION_MINOR}*100 + ${RUBY_VERSION_PATCH}")
diff --git a/debian/patches/series b/debian/patches/series
index 1d585ed..aa9ef00 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-install_to_usr.diff
 use_ruby1.8.diff
 fix_ruby_requires.diff
diff --git a/debian/rules b/debian/rules
index 29ef33c..ef06fba 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,14 +1,21 @@
 #! /usr/bin/make -f
 
+#Always use Ruby 1.8.x
+RUBY_SITEARCH := $(shell ruby1.8 -rrbconfig -e 'puts Config::CONFIG["sitearch"]')
+CMAKE_FLAGS := \
+  -DRUBY_EXECUTABLE=/usr/bin/ruby1.8 \
+  -DCUSTOM_RUBY_SITE_LIB_DIR=/usr/lib/ruby/1.8/ \
+  -DCUSTOM_RUBY_SITE_ARCH_DIR=/usr/lib/ruby/1.8/$(RUBY_SITEARCH) \
+  $(NULL)
+
 override_dh_install:
 	dh_install --list-missing
 
 override_dh_strip:
 	dh_strip --dbg-package=ruby-qt4-dbg
 
-#Always use Ruby 1.8.x
 override_dh_auto_configure:
-	dh_auto_configure -- -DRUBY_EXECUTABLE=/usr/bin/ruby1.8
+	dh_auto_configure -- $(CMAKE_FLAGS)
 
 #Build-Depend on debhelper (>= 7.4.10) for --parallel
 #Build-Depend on pkg-kde-tools (>= 0.6.8) for the sodeps addon

-- 
qtruby packaging