[Pkg-ruby-extras-maintainers] r639 - in tools/ruby-pkg-tools/trunk: 1/class debian

[Esteban Manchado Velázquez]

Author: zoso
Date: 2006-06-26 21:17:27 +0000 (Mon, 26 Jun 2006)
New Revision: 639

Modified:
   tools/ruby-pkg-tools/trunk/1/class/ruby-common.mk
   tools/ruby-pkg-tools/trunk/1/class/ruby-extconf-rb.mk
   tools/ruby-pkg-tools/trunk/debian/changelog
Log:
- Revert previous hack patch for #360986, and apply the one proposed in the
  first place by the submitter
- Remove the $(strip ...) call when using the $(DEB_RUBY_LIBDIR), as it's now
  automatically stripped
- Added a $(DEB_RUBY_ARCHDIR) variable to ruby-common


Modified: tools/ruby-pkg-tools/trunk/1/class/ruby-common.mk
===================================================================
--- tools/ruby-pkg-tools/trunk/1/class/ruby-common.mk	2006-06-20 21:18:46 UTC (rev 638)
+++ tools/ruby-pkg-tools/trunk/1/class/ruby-common.mk	2006-06-26 21:17:27 UTC (rev 639)
@@ -44,7 +44,8 @@
 DEB_RUBY_COMPILE_VERSION = 
 
 DEB_RUBY_VERSIONS = 1.8 1.9
-DEB_RUBY_LIBDIR=$(shell ruby -rrbconfig -e 'puts Config::CONFIG["libdir"]')/ruby
+DEB_RUBY_LIBDIR=$(strip $(shell ruby -rrbconfig -e 'puts Config::CONFIG["libdir"]')/ruby)
+DEB_RUBY_ARCHDIR=$(strip $(shell ruby -rrbconfig -e 'puts Config::CONFIG["archdir"]'))/ruby
 
 # Separate lib packages from the rest
 LIB_PACKAGE_FILTER = %-ruby $(patsubst %,\%-ruby%,$(DEB_RUBY_VERSIONS))

Modified: tools/ruby-pkg-tools/trunk/1/class/ruby-extconf-rb.mk
===================================================================
--- tools/ruby-pkg-tools/trunk/1/class/ruby-extconf-rb.mk	2006-06-20 21:18:46 UTC (rev 638)
+++ tools/ruby-pkg-tools/trunk/1/class/ruby-extconf-rb.mk	2006-06-26 21:17:27 UTC (rev 639)
@@ -14,22 +14,20 @@
 
 include /usr/share/ruby-pkg-tools/1/class/ruby-common.mk
 
-DEB_RUBY_SETUP_RUBY_ARGS = -rglobal.rb
 DEB_RUBY_SETUP_CMD = extconf.rb
 DEB_RUBY_SETUP_ARGS =
 
-prepare_extconf_setup = echo '$$extout = "$$(DESTDIR)/$(strip $(DEB_RUBY_LIBDIR))/$(cdbs_ruby_ver)"' >global.rb
-
 cdbs_pkgdir = $(CURDIR)/debian/$(cdbs_curpkg)
-cdbs_ruby_libdir_ver = $(cdbs_pkgdir)$(strip $(DEB_RUBY_LIBDIR))/$(cdbs_ruby_ver)
+cdbs_ruby_libdir_ver = $(cdbs_pkgdir)$(DEB_RUBY_LIBDIR)/$(cdbs_ruby_ver)
+cdbs_ruby_archdir_ver = $(cdbs_pkgdir)$(DEB_RUBY_ARCHDIR)
 
 DEB_RUBY_INSTALL_ARGS = DESTDIR=$(cdbs_pkgdir) \
-	sitelibdir=$(cdbs_ruby_libdir_ver)
+	sitelibdir=$(cdbs_ruby_libdir_ver) \
+        sitearchdir=$(cdbs_ruby_archdir_ver)
 
 # Build simple packages.
 $(patsubst %,build/%,$(DEB_RUBY_SIMPLE_PACKAGES)) :: build/% :
 	cd $(DEB_SRCDIR)
-	$(call prepare_extconf_setup)
 	/usr/bin/ruby $(DEB_RUBY_SETUP_RUBY_ARGS) $(DEB_RUBY_SETUP_CMD) $(DEB_RUBY_SETUP_ARGS)
 	$(MAKE)
 
@@ -42,14 +40,12 @@
 $(patsubst %,install/%,$(DEB_RUBY_REAL_LIB_PACKAGES)) :: install/% :
 	cd $(DEB_SRCDIR) 
 	-$(MAKE) distclean
-	$(call prepare_extconf_setup)
 	/usr/bin/ruby$(cdbs_ruby_ver) $(DEB_RUBY_SETUP_RUBY_ARGS) $(DEB_RUBY_SETUP_CMD) $(DEB_RUBY_SETUP_ARGS)
 	$(MAKE)
 	$(MAKE) install $(DEB_RUBY_INSTALL_ARGS)
 
 clean::
 	-$(MAKE) distclean
-	rm -f $(DEB_SRCDIR)/global.rb
 
 endif
 

Modified: tools/ruby-pkg-tools/trunk/debian/changelog
===================================================================
--- tools/ruby-pkg-tools/trunk/debian/changelog	2006-06-20 21:18:46 UTC (rev 638)
+++ tools/ruby-pkg-tools/trunk/debian/changelog	2006-06-26 21:17:27 UTC (rev 639)
@@ -14,20 +14,21 @@
 
   [ Esteban Manchado Velázquez ]
   * ruby-common.mk:
-    * Fix DEB_RUBY_LIBDIR hardcodedness.
+    * Fix DEB_RUBY_LIBDIR hardcodedness, and strip it.
     * Drop support for Ruby 1.6.
     * Avoid rb files compression, if using debhelper. Thanks to Lucas Nussbaum
       for the idea and code.
+    * Also define a DEB_RUBY_ARCHDIR variable.
   * ruby-get-sources:
     * Drop support for sources file.
     * Some code refactoring.
   * ruby-extconf-rb.mk:
-    * Specify base installation dir for extensions, so they don't get
-      installed under /usr/local (Closes: #360986).
+    * Specify both sitelibdir and sitearchdir (Closes: #360986). Thanks to
+      Sjoerd Simons, the submitter, for the patch.
   * debian/control.in:
     * Bumped Standars-Version to 3.7.2 (no changes).
 
- -- Esteban Manchado Velázquez <zoso at debian.org>  Tue, 20 Jun 2006 22:14:18 +0100
+ -- Esteban Manchado Velázquez <zoso at debian.org>  Mon, 26 Jun 2006 22:16:35 +0100
 
 ruby-pkg-tools (0.9) unstable; urgency=low