[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#520901: patches



Control: tag -1 patch

Hi,

I gave a try a making a patch to build qtruby against ruby1.9.1 instead
of ruby1.8.

Please find attached the sequence of changes, as well as the full debdiff.

I had to add a Build-Conflicts with ruby1.8, since otherwise the
libraries got linked against libruby1.8 if it happened to be installed
on the system during the build.

Tell me what you think.

Cheers,

Cédric
From 3f8f282d72b9d9153dc9be8b3c0c9a26f83d009d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Boutillier?= <boutil@debian.org>
Date: Tue, 17 Sep 2013 14:43:11 +0200
Subject: [PATCH 1/4] build-conflict with ruby1.8 and build with ruby1.9.1

---
 debian/control | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/control b/debian/control
index 84056cf..dc6f1bd 100644
--- a/debian/control
+++ b/debian/control
@@ -4,9 +4,10 @@ Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Torsten Marek <shlomme@debian.org>, Sune Vuorela <sune@debian.org>, David Palacio <dpalacio@orbitalibre.org>, Michael Meskes <meskes@debian.org>,
            Maximiliano Curia <maxy@debian.org>
+Build-Conflicts: libruby1.8
 Build-Depends: debhelper (>= 9), pkg-kde-tools (>= 0.6.8), cmake,
  smoke-dev-tools (>= 4:4.10), libsmokeqt4-dev (>= 4:4.10),
- ruby1.8, ruby1.8-dev,
+ ruby1.9.1, ruby1.9.1-dev,
  libqt4-dev, libqtwebkit-dev, libphonon-dev, libqscintilla2-dev
 Standards-Version: 3.9.4
 Homepage: http://projects.kde.org/projects/kde/kdebindings/ruby/qtruby
@@ -42,7 +43,7 @@ Description: QScintilla2 bindings for the Ruby language
 Package: ruby-qt4
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: ruby1.8
+Recommends: ruby1.9.1
 Provides: libqt4-ruby, libqt4-ruby1.8
 Replaces: libqt4-ruby (<< 4:4.6.80), libqt4-ruby1.8 (<< 4:4.6.80)
 Breaks: libqt4-ruby (<< 4:4.6.80), libqt4-ruby1.8 (<< 4:4.6.80)
@@ -71,7 +72,7 @@ Architecture: any
 Breaks: kdebindings-dbg
 Replaces: kdebindings-dbg
 Depends: ruby-qt4 (= ${binary:Version}), ${misc:Depends}
-Recommends: libsmokeqt4-dbg, libruby1.8-dbg
+Recommends: libsmokeqt4-dbg, libruby1.9.1-dbg
 Description: Qt 4 bindings for the Ruby language -- debug symbols
  This package provides the debug symbols of the Qt 4 Ruby bindings.
  .
-- 
1.8.4.rc3

From a12eedcc09f1744a4b7d7f5064873465e13d6994 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Boutillier?= <boutil@debian.org>
Date: Tue, 17 Sep 2013 14:43:55 +0200
Subject: [PATCH 2/4] install files in Ruby vendor locations as per Ruby policy

---
 debian/rules | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/debian/rules b/debian/rules
index 4d66f5b..99d406a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,12 +3,12 @@
 pkgs_lib := $(filter-out %-dev %-dbg,$(filter lib%,$(shell dh_listpackages)))
 current_version := $(shell dpkg-parsechangelog | sed -n 's/^Version: //p')
 
-#Always use Ruby 1.8.x
-RUBY_SITEARCH := $(shell ruby1.8 -rrbconfig -e 'puts Config::CONFIG["sitearch"]')
+
+RUBY_VENDORARCHDIR := $(shell ruby -rrbconfig -e 'puts RbConfig::CONFIG["vendorarchdir"]')
+RUBY_VENDORDIR := $(shell ruby -rrbconfig -e 'puts RbConfig::CONFIG["vendordir"]')
 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) \
+  -DCUSTOM_RUBY_SITE_LIB_DIR=$(RUBY_VENDORDIR) \
+  -DCUSTOM_RUBY_SITE_ARCH_DIR=$(RUBY_VENDORARCHDIR) \
   $(NULL)
 
 override_dh_install:
-- 
1.8.4.rc3

From 352ae8f9fc61cba21bcadb580624460663cefc33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Boutillier?= <boutil@debian.org>
Date: Tue, 17 Sep 2013 14:45:56 +0200
Subject: [PATCH 3/4] fix install path for Ruby libs

---
 debian/ruby-phonon.install          | 4 ++--
 debian/ruby-qscintilla2.install     | 4 ++--
 debian/ruby-qt4-declarative.install | 4 ++--
 debian/ruby-qt4-script.install      | 4 ++--
 debian/ruby-qt4-test.install        | 4 ++--
 debian/ruby-qt4-uitools.install     | 4 ++--
 debian/ruby-qt4-webkit.install      | 4 ++--
 debian/ruby-qt4.install             | 6 +++---
 debian/ruby-qwt5.install            | 4 ++--
 9 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/debian/ruby-phonon.install b/debian/ruby-phonon.install
index 4214be8..338ea64 100644
--- a/debian/ruby-phonon.install
+++ b/debian/ruby-phonon.install
@@ -1,2 +1,2 @@
-usr/lib/ruby/1.8/phonon/phonon.rb
-usr/lib/ruby/1.8/*/phonon.so
+usr/lib/ruby/vendor_ruby/phonon/phonon.rb
+usr/lib/ruby/vendor_ruby/*/*/phonon.so
diff --git a/debian/ruby-qscintilla2.install b/debian/ruby-qscintilla2.install
index 3bad1b8..ed51027 100644
--- a/debian/ruby-qscintilla2.install
+++ b/debian/ruby-qscintilla2.install
@@ -1,2 +1,2 @@
-usr/lib/ruby/1.8/qscintilla/qscintilla.rb
-usr/lib/ruby/1.8/*/qscintilla.so
+usr/lib/ruby/vendor_ruby/qscintilla/qscintilla.rb
+usr/lib/ruby/vendor_ruby/*/*/qscintilla.so
diff --git a/debian/ruby-qt4-declarative.install b/debian/ruby-qt4-declarative.install
index c3f1814..da994db 100644
--- a/debian/ruby-qt4-declarative.install
+++ b/debian/ruby-qt4-declarative.install
@@ -1,2 +1,2 @@
-usr/lib/ruby/1.8/qtdeclarative/qtdeclarative.rb
-usr/lib/ruby/1.8/*/qtdeclarative.so
+usr/lib/ruby/vendor_ruby/qtdeclarative/qtdeclarative.rb
+usr/lib/ruby/vendor_ruby/*/*/qtdeclarative.so
diff --git a/debian/ruby-qt4-script.install b/debian/ruby-qt4-script.install
index 29a847b..f68ddd1 100644
--- a/debian/ruby-qt4-script.install
+++ b/debian/ruby-qt4-script.install
@@ -1,2 +1,2 @@
-usr/lib/ruby/1.8/qtscript/qtscript.rb
-usr/lib/ruby/1.8/*/qtscript.so
+usr/lib/ruby/vendor_ruby/qtscript/qtscript.rb
+usr/lib/ruby/vendor_ruby/*/*/qtscript.so
diff --git a/debian/ruby-qt4-test.install b/debian/ruby-qt4-test.install
index 076cf4c..2da39f4 100644
--- a/debian/ruby-qt4-test.install
+++ b/debian/ruby-qt4-test.install
@@ -1,2 +1,2 @@
-usr/lib/ruby/1.8/qttest/qttest.rb
-usr/lib/ruby/1.8/*/qttest.so
+usr/lib/ruby/vendor_ruby/qttest/qttest.rb
+usr/lib/ruby/vendor_ruby/*/*/qttest.so
diff --git a/debian/ruby-qt4-uitools.install b/debian/ruby-qt4-uitools.install
index de490cf..0617c6f 100644
--- a/debian/ruby-qt4-uitools.install
+++ b/debian/ruby-qt4-uitools.install
@@ -1,2 +1,2 @@
-usr/lib/ruby/1.8/qtuitools/qtuitools.rb
-usr/lib/ruby/1.8/*/qtuitools.so
+usr/lib/ruby/vendor_ruby/qtuitools/qtuitools.rb
+usr/lib/ruby/vendor_ruby/*/*/qtuitools.so
diff --git a/debian/ruby-qt4-webkit.install b/debian/ruby-qt4-webkit.install
index 9870da1..dadf947 100644
--- a/debian/ruby-qt4-webkit.install
+++ b/debian/ruby-qt4-webkit.install
@@ -1,2 +1,2 @@
-usr/lib/ruby/1.8/qtwebkit/qtwebkit.rb
-usr/lib/ruby/1.8/*/qtwebkit.so
+usr/lib/ruby/vendor_ruby/qtwebkit/qtwebkit.rb
+usr/lib/ruby/vendor_ruby/*/*/qtwebkit.so
diff --git a/debian/ruby-qt4.install b/debian/ruby-qt4.install
index 575ab0a..b3d8c7b 100644
--- a/debian/ruby-qt4.install
+++ b/debian/ruby-qt4.install
@@ -1,6 +1,6 @@
 usr/bin/rbqtapi
 usr/bin/rbrcc
 usr/bin/rbuic4
-usr/lib/ruby/1.8/Qt/*.rb
-usr/lib/ruby/1.8/Qt*.rb
-usr/lib/ruby/1.8/*/qtruby4.so
+usr/lib/ruby/vendor_ruby/Qt/*.rb
+usr/lib/ruby/vendor_ruby/Qt*.rb
+usr/lib/ruby/vendor_ruby/*/*/qtruby4.so
diff --git a/debian/ruby-qwt5.install b/debian/ruby-qwt5.install
index 4d73a76..20d992c 100644
--- a/debian/ruby-qwt5.install
+++ b/debian/ruby-qwt5.install
@@ -1,2 +1,2 @@
-usr/lib/ruby/1.8/qwt/qwt.rb
-usr/lib/ruby/1.8/*/qwt.so
+usr/lib/ruby/vendor_ruby/qwt/qwt.rb
+usr/lib/ruby/vendor_ruby/*/*/qwt.so
-- 
1.8.4.rc3

From 030cf315268b63e6de6fd78b012673727f847536 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Boutillier?= <boutil@debian.org>
Date: Tue, 17 Sep 2013 14:47:13 +0200
Subject: [PATCH 4/4] drop use_ruby1.8.diff, since the default Ruby version is
 used now

---
 debian/patches/series           |  1 -
 debian/patches/use_ruby1.8.diff | 14 --------------
 2 files changed, 15 deletions(-)
 delete mode 100644 debian/patches/use_ruby1.8.diff

diff --git a/debian/patches/series b/debian/patches/series
index aa9ef00..1f2052f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-use_ruby1.8.diff
 fix_ruby_requires.diff
diff --git a/debian/patches/use_ruby1.8.diff b/debian/patches/use_ruby1.8.diff
deleted file mode 100644
index 019998a..0000000
--- a/debian/patches/use_ruby1.8.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-Author: Vincent Fourmond <fourmond@debian.org>
-Description: Use Debian executable name
-Last-Update: 2011-06-24
-Origin: vendor
-Forwarded: no
-
---- a/bin/rbqtapi
-+++ b/bin/rbqtapi
-@@ -1,4 +1,4 @@
--#!/usr/bin/env ruby
-+#!/usr/bin/env ruby1.8
- 
- # Note: this program is part of qtruby and makes use of its internal functions.
- #       You should not rely on those in your own programs.
-- 
1.8.4.rc3

diff -Nru qtruby-4.10.5/debian/changelog qtruby-4.10.5/debian/changelog
--- qtruby-4.10.5/debian/changelog	2013-07-12 20:22:42.000000000 +0200
+++ qtruby-4.10.5/debian/changelog	2013-09-17 14:54:00.000000000 +0200
@@ -1,3 +1,12 @@
+qtruby (4:4.10.5-1.1) UNRELEASED; urgency=low
+
+  * build-conflict with ruby1.8 and build with ruby1.9.1
+  * install files in Ruby vendor locations as per Ruby policy
+  * fix install path for Ruby libs
+  * drop use_ruby1.8.diff, since the default Ruby version is used now
+
+ -- Cédric Boutillier <boutil@debian.org>  Tue, 17 Sep 2013 14:53:38 +0200
+
 qtruby (4:4.10.5-1) unstable; urgency=low
 
   * New upstream release.
diff -Nru qtruby-4.10.5/debian/control qtruby-4.10.5/debian/control
--- qtruby-4.10.5/debian/control	2013-07-12 20:22:42.000000000 +0200
+++ qtruby-4.10.5/debian/control	2013-09-17 14:41:19.000000000 +0200
@@ -4,9 +4,10 @@
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Torsten Marek <shlomme@debian.org>, Sune Vuorela <sune@debian.org>, David Palacio <dpalacio@orbitalibre.org>, Michael Meskes <meskes@debian.org>,
            Maximiliano Curia <maxy@debian.org>
+Build-Conflicts: libruby1.8
 Build-Depends: debhelper (>= 9), pkg-kde-tools (>= 0.6.8), cmake,
  smoke-dev-tools (>= 4:4.10), libsmokeqt4-dev (>= 4:4.10),
- ruby1.8, ruby1.8-dev,
+ ruby1.9.1, ruby1.9.1-dev,
  libqt4-dev, libqtwebkit-dev, libphonon-dev, libqscintilla2-dev
 Standards-Version: 3.9.4
 Homepage: http://projects.kde.org/projects/kde/kdebindings/ruby/qtruby
@@ -42,7 +43,7 @@
 Package: ruby-qt4
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: ruby1.8
+Recommends: ruby1.9.1
 Provides: libqt4-ruby, libqt4-ruby1.8
 Replaces: libqt4-ruby (<< 4:4.6.80), libqt4-ruby1.8 (<< 4:4.6.80)
 Breaks: libqt4-ruby (<< 4:4.6.80), libqt4-ruby1.8 (<< 4:4.6.80)
@@ -71,7 +72,7 @@
 Breaks: kdebindings-dbg
 Replaces: kdebindings-dbg
 Depends: ruby-qt4 (= ${binary:Version}), ${misc:Depends}
-Recommends: libsmokeqt4-dbg, libruby1.8-dbg
+Recommends: libsmokeqt4-dbg, libruby1.9.1-dbg
 Description: Qt 4 bindings for the Ruby language -- debug symbols
  This package provides the debug symbols of the Qt 4 Ruby bindings.
  .
diff -Nru qtruby-4.10.5/debian/patches/series qtruby-4.10.5/debian/patches/series
--- qtruby-4.10.5/debian/patches/series	2013-07-12 20:22:42.000000000 +0200
+++ qtruby-4.10.5/debian/patches/series	2013-09-17 14:48:57.000000000 +0200
@@ -1,2 +1 @@
-use_ruby1.8.diff
 fix_ruby_requires.diff
diff -Nru qtruby-4.10.5/debian/patches/use_ruby1.8.diff qtruby-4.10.5/debian/patches/use_ruby1.8.diff
--- qtruby-4.10.5/debian/patches/use_ruby1.8.diff	2013-07-12 20:22:42.000000000 +0200
+++ qtruby-4.10.5/debian/patches/use_ruby1.8.diff	1970-01-01 01:00:00.000000000 +0100
@@ -1,14 +0,0 @@
-Author: Vincent Fourmond <fourmond@debian.org>
-Description: Use Debian executable name
-Last-Update: 2011-06-24
-Origin: vendor
-Forwarded: no
-
---- a/bin/rbqtapi
-+++ b/bin/rbqtapi
-@@ -1,4 +1,4 @@
--#!/usr/bin/env ruby
-+#!/usr/bin/env ruby1.8
- 
- # Note: this program is part of qtruby and makes use of its internal functions.
- #       You should not rely on those in your own programs.
diff -Nru qtruby-4.10.5/debian/ruby-phonon.install qtruby-4.10.5/debian/ruby-phonon.install
--- qtruby-4.10.5/debian/ruby-phonon.install	2013-07-12 20:22:42.000000000 +0200
+++ qtruby-4.10.5/debian/ruby-phonon.install	2013-09-17 14:48:42.000000000 +0200
@@ -1,2 +1,2 @@
-usr/lib/ruby/1.8/phonon/phonon.rb
-usr/lib/ruby/1.8/*/phonon.so
+usr/lib/ruby/vendor_ruby/phonon/phonon.rb
+usr/lib/ruby/vendor_ruby/*/*/phonon.so
diff -Nru qtruby-4.10.5/debian/ruby-qscintilla2.install qtruby-4.10.5/debian/ruby-qscintilla2.install
--- qtruby-4.10.5/debian/ruby-qscintilla2.install	2013-07-12 20:22:42.000000000 +0200
+++ qtruby-4.10.5/debian/ruby-qscintilla2.install	2013-09-17 14:03:04.000000000 +0200
@@ -1,2 +1,2 @@
-usr/lib/ruby/1.8/qscintilla/qscintilla.rb
-usr/lib/ruby/1.8/*/qscintilla.so
+usr/lib/ruby/vendor_ruby/qscintilla/qscintilla.rb
+usr/lib/ruby/vendor_ruby/*/*/qscintilla.so
diff -Nru qtruby-4.10.5/debian/ruby-qt4-declarative.install qtruby-4.10.5/debian/ruby-qt4-declarative.install
--- qtruby-4.10.5/debian/ruby-qt4-declarative.install	2013-07-12 20:22:42.000000000 +0200
+++ qtruby-4.10.5/debian/ruby-qt4-declarative.install	2013-09-17 14:03:16.000000000 +0200
@@ -1,2 +1,2 @@
-usr/lib/ruby/1.8/qtdeclarative/qtdeclarative.rb
-usr/lib/ruby/1.8/*/qtdeclarative.so
+usr/lib/ruby/vendor_ruby/qtdeclarative/qtdeclarative.rb
+usr/lib/ruby/vendor_ruby/*/*/qtdeclarative.so
diff -Nru qtruby-4.10.5/debian/ruby-qt4.install qtruby-4.10.5/debian/ruby-qt4.install
--- qtruby-4.10.5/debian/ruby-qt4.install	2013-07-12 20:22:42.000000000 +0200
+++ qtruby-4.10.5/debian/ruby-qt4.install	2013-09-17 14:03:37.000000000 +0200
@@ -1,6 +1,6 @@
 usr/bin/rbqtapi
 usr/bin/rbrcc
 usr/bin/rbuic4
-usr/lib/ruby/1.8/Qt/*.rb
-usr/lib/ruby/1.8/Qt*.rb
-usr/lib/ruby/1.8/*/qtruby4.so
+usr/lib/ruby/vendor_ruby/Qt/*.rb
+usr/lib/ruby/vendor_ruby/Qt*.rb
+usr/lib/ruby/vendor_ruby/*/*/qtruby4.so
diff -Nru qtruby-4.10.5/debian/ruby-qt4-script.install qtruby-4.10.5/debian/ruby-qt4-script.install
--- qtruby-4.10.5/debian/ruby-qt4-script.install	2013-07-12 20:22:42.000000000 +0200
+++ qtruby-4.10.5/debian/ruby-qt4-script.install	2013-09-17 14:03:48.000000000 +0200
@@ -1,2 +1,2 @@
-usr/lib/ruby/1.8/qtscript/qtscript.rb
-usr/lib/ruby/1.8/*/qtscript.so
+usr/lib/ruby/vendor_ruby/qtscript/qtscript.rb
+usr/lib/ruby/vendor_ruby/*/*/qtscript.so
diff -Nru qtruby-4.10.5/debian/ruby-qt4-test.install qtruby-4.10.5/debian/ruby-qt4-test.install
--- qtruby-4.10.5/debian/ruby-qt4-test.install	2013-07-12 20:22:42.000000000 +0200
+++ qtruby-4.10.5/debian/ruby-qt4-test.install	2013-09-17 14:03:56.000000000 +0200
@@ -1,2 +1,2 @@
-usr/lib/ruby/1.8/qttest/qttest.rb
-usr/lib/ruby/1.8/*/qttest.so
+usr/lib/ruby/vendor_ruby/qttest/qttest.rb
+usr/lib/ruby/vendor_ruby/*/*/qttest.so
diff -Nru qtruby-4.10.5/debian/ruby-qt4-uitools.install qtruby-4.10.5/debian/ruby-qt4-uitools.install
--- qtruby-4.10.5/debian/ruby-qt4-uitools.install	2013-07-12 20:22:42.000000000 +0200
+++ qtruby-4.10.5/debian/ruby-qt4-uitools.install	2013-09-17 14:04:03.000000000 +0200
@@ -1,2 +1,2 @@
-usr/lib/ruby/1.8/qtuitools/qtuitools.rb
-usr/lib/ruby/1.8/*/qtuitools.so
+usr/lib/ruby/vendor_ruby/qtuitools/qtuitools.rb
+usr/lib/ruby/vendor_ruby/*/*/qtuitools.so
diff -Nru qtruby-4.10.5/debian/ruby-qt4-webkit.install qtruby-4.10.5/debian/ruby-qt4-webkit.install
--- qtruby-4.10.5/debian/ruby-qt4-webkit.install	2013-07-12 20:22:42.000000000 +0200
+++ qtruby-4.10.5/debian/ruby-qt4-webkit.install	2013-09-17 14:04:11.000000000 +0200
@@ -1,2 +1,2 @@
-usr/lib/ruby/1.8/qtwebkit/qtwebkit.rb
-usr/lib/ruby/1.8/*/qtwebkit.so
+usr/lib/ruby/vendor_ruby/qtwebkit/qtwebkit.rb
+usr/lib/ruby/vendor_ruby/*/*/qtwebkit.so
diff -Nru qtruby-4.10.5/debian/ruby-qwt5.install qtruby-4.10.5/debian/ruby-qwt5.install
--- qtruby-4.10.5/debian/ruby-qwt5.install	2013-07-12 20:22:42.000000000 +0200
+++ qtruby-4.10.5/debian/ruby-qwt5.install	2013-09-17 14:04:18.000000000 +0200
@@ -1,2 +1,2 @@
-usr/lib/ruby/1.8/qwt/qwt.rb
-usr/lib/ruby/1.8/*/qwt.so
+usr/lib/ruby/vendor_ruby/qwt/qwt.rb
+usr/lib/ruby/vendor_ruby/*/*/qwt.so
diff -Nru qtruby-4.10.5/debian/rules qtruby-4.10.5/debian/rules
--- qtruby-4.10.5/debian/rules	2013-07-12 20:22:42.000000000 +0200
+++ qtruby-4.10.5/debian/rules	2013-09-17 14:19:42.000000000 +0200
@@ -3,12 +3,12 @@
 pkgs_lib := $(filter-out %-dev %-dbg,$(filter lib%,$(shell dh_listpackages)))
 current_version := $(shell dpkg-parsechangelog | sed -n 's/^Version: //p')
 
-#Always use Ruby 1.8.x
-RUBY_SITEARCH := $(shell ruby1.8 -rrbconfig -e 'puts Config::CONFIG["sitearch"]')
+
+RUBY_VENDORARCHDIR := $(shell ruby -rrbconfig -e 'puts RbConfig::CONFIG["vendorarchdir"]')
+RUBY_VENDORDIR := $(shell ruby -rrbconfig -e 'puts RbConfig::CONFIG["vendordir"]')
 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) \
+  -DCUSTOM_RUBY_SITE_LIB_DIR=$(RUBY_VENDORDIR) \
+  -DCUSTOM_RUBY_SITE_ARCH_DIR=$(RUBY_VENDORARCHDIR) \
   $(NULL)
 
 override_dh_install:

Attachment: signature.asc
Description: Digital signature


Reply to: