[Pkg-ruby-extras-maintainers] r636 - tools/ruby-pkg-tools/trunk/1/class

[Esteban Manchado Velázquez]

Author: zoso
Date: 2006-06-19 22:02:49 +0000 (Mon, 19 Jun 2006)
New Revision: 636

Modified:
   tools/ruby-pkg-tools/trunk/1/class/ruby-extconf-rb.mk
Log:
- Moved duplicated ugly hack to a proper Makefile macro "prepare_extconf_setup"
- Use $(strip ...) for $(DEB_RUBY_LIBDIR) in the new macro. Thanks Sjoerd
  Simons for the fix
- In this commit I'm leaving "$$(DESTDIR)", so the DESTDIR variable for the
  _generated_ Makefile (not the CDBS class) is used. I'm not sure if it's
  better to try to sort everything out by ourselves. See #360986 for more
  details


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-19 21:51:58 UTC (rev 635)
+++ tools/ruby-pkg-tools/trunk/1/class/ruby-extconf-rb.mk	2006-06-19 22:02:49 UTC (rev 636)
@@ -18,6 +18,8 @@
 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)
 
@@ -27,7 +29,7 @@
 # Build simple packages.
 $(patsubst %,build/%,$(DEB_RUBY_SIMPLE_PACKAGES)) :: build/% :
 	cd $(DEB_SRCDIR)
-	echo '$$extout = "$$(DESTDIR)/$(DEB_RUBY_LIBDIR)/$(cdbs_ruby_ver)"' >global.rb
+	$(call prepare_extconf_setup)
 	/usr/bin/ruby $(DEB_RUBY_SETUP_RUBY_ARGS) $(DEB_RUBY_SETUP_CMD) $(DEB_RUBY_SETUP_ARGS)
 	$(MAKE)
 
@@ -40,7 +42,7 @@
 $(patsubst %,install/%,$(DEB_RUBY_REAL_LIB_PACKAGES)) :: install/% :
 	cd $(DEB_SRCDIR) 
 	-$(MAKE) distclean
-	echo '$$extout = "$$(DESTDIR)/$(DEB_RUBY_LIBDIR)/$(cdbs_ruby_ver)"' >global.rb
+	$(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)