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

[Marc Dequènes]

Author: duck
Date: 2006-01-04 23:28:21 +0000 (Wed, 04 Jan 2006)
New Revision: 212

Modified:
   tools/ruby-pkg-tools/trunk/1/class/ruby-setup-rb.mk
Log:
Fixed CDBS class for 'simple packages' case

Modified: tools/ruby-pkg-tools/trunk/1/class/ruby-setup-rb.mk
===================================================================
--- tools/ruby-pkg-tools/trunk/1/class/ruby-setup-rb.mk	2006-01-04 22:14:51 UTC (rev 211)
+++ tools/ruby-pkg-tools/trunk/1/class/ruby-setup-rb.mk	2006-01-04 23:28:21 UTC (rev 212)
@@ -53,37 +53,46 @@
 DEB_RUBY_REAL_LIB_PACKAGES := $(strip $(filter-out %-ruby, $(DEB_RUBY_LIB_PACKAGES)))
 DEB_RUBY_DUMMY_LIB_PACKAGES := $(strip $(filter %-ruby, $(DEB_RUBY_LIB_PACKAGES)))
 DEB_RUBY_LIB_DOC_PACKAGES := $(strip $(filter $(LIB_DOC_PACKAGE_FILTER),$(DEB_ALL_PACKAGES)))
-DEB_RUBY_OTHER_PACKAGES := $(strip $(filter-out $(LIB_PACKAGE_FILTER),$(DEB_ALL_PACKAGES)))
+ifeq (,$(DEB_RUBY_REAL_LIB_PACKAGES))
+DEB_RUBY_SIMPLE_PACKAGES := $(strip $(filter-out $(LIB_PACKAGE_FILTER),$(DEB_ALL_PACKAGES)))
+endif
 
-# Voodoo to add the "doc" directory to DEB_INSTALL_DOCS_foo, for every foo in
-# $(DEB_RUBY_LIB_DOC_PACKAGES)
-# $(foreach package,$(DEB_RUBY_LIB_DOC_PACKAGES),$(eval DEB_INSTALL_DOCS_$(package) += doc))
-
 cdbs_ruby_ver = $(filter-out %-,$(subst -ruby,- ,$(cdbs_curpkg)))
 
 push_cfg_file = if [ -f $(DEB_SRCDIR)/.config ]; then mv -f $(DEB_SRCDIR)/.config $(DEB_SRCDIR)/.config-$(1); fi
 pop_cfg_file  = if [ -f $(DEB_SRCDIR)/.config-$(1) ]; then mv -f $(DEB_SRCDIR)/.config-$(1) $(DEB_SRCDIR)/.config; fi
 
-# common-build-arch common-build-indep:: common-build-impl
-# common-build-impl::
+
 $(patsubst %,build/%,$(DEB_RUBY_REAL_LIB_PACKAGES)) :: build/% :
 	cd $(DEB_SRCDIR) && /usr/bin/ruby$(cdbs_ruby_ver) $(DEB_RUBY_SETUP_CMD) config $(DEB_RUBY_CONFIG_ARGS) && /usr/bin/ruby$(cdbs_ruby_ver) $(DEB_RUBY_SETUP_CMD) setup $(DEB_RUBY_SETUP_ARGS)
 	$(call push_cfg_file,$(cdbs_curpkg))
 
+$(patsubst %,build/%,$(DEB_RUBY_SIMPLE_PACKAGES)) :: build/% :
+	cd $(DEB_SRCDIR) && /usr/bin/ruby $(DEB_RUBY_SETUP_CMD) config $(DEB_RUBY_CONFIG_ARGS) && /usr/bin/ruby $(DEB_RUBY_SETUP_CMD) setup $(DEB_RUBY_SETUP_ARGS)
+	$(call push_cfg_file,$(cdbs_curpkg))
+
+
+# See if this package doesn't appear to need to be compiled by multiple
+# Ruby versions.
+$(patsubst %,install/%,$(DEB_RUBY_REAL_LIB_PACKAGES)) :: install/% :
+	$(call pop_cfg_file,$(cdbs_curpkg))
+	cd $(DEB_SRCDIR) && /usr/bin/ruby$(cdbs_ruby_ver) $(DEB_RUBY_SETUP_CMD) install --prefix=debian/$(cdbs_curpkg) $(DEB_RUBY_INSTALL_ARGS_ALL) $(DEB_RUBY_INSTALL_ARGS_$(cdbs_curpkg))
+	$(call push_cfg_file,$(cdbs_curpkg))
+
+$(patsubst %,install/%,$(DEB_RUBY_SIMPLE_PACKAGES)) :: install/% :
+	$(call pop_cfg_file,$(cdbs_curpkg))
+	cd $(DEB_SRCDIR) && /usr/bin/ruby $(DEB_RUBY_SETUP_CMD) install --prefix=debian/$(cdbs_curpkg) $(DEB_RUBY_INSTALL_ARGS_ALL) $(DEB_RUBY_INSTALL_ARGS_$(cdbs_curpkg))
+	$(call push_cfg_file,$(cdbs_curpkg))
+
+
 $(patsubst %,binary-install/%,$(DEB_RUBY_LIB_DOC_PACKAGES)) :: binary-install/% :
 	dh_rdoc -p$(cdbs_curpkg)
 
+
 clean::
 # Ignore errors from this rule.  In a tarball build, the file
 # may not exist.
 	-ruby $(DEB_RUBY_SETUP_CMD) distclean $(DEB_RUBY_CLEAN_ARGS)
 	rm -f $(DEB_SRCDIR)/.config-*
 
-# See if this package doesn't appear to need to be compiled by multiple
-# Ruby versions.
-$(patsubst %,install/%,$(DEB_RUBY_REAL_LIB_PACKAGES)) :: install/% :
-	$(call pop_cfg_file,$(cdbs_curpkg))
-	cd $(DEB_SRCDIR) && /usr/bin/ruby$(cdbs_ruby_ver) $(DEB_RUBY_SETUP_CMD) install --prefix=debian/$(cdbs_curpkg) $(DEB_RUBY_INSTALL_ARGS_ALL) $(DEB_RUBY_INSTALL_ARGS_$(cdbs_curpkg))
-	$(call push_cfg_file,$(cdbs_curpkg))
-
 endif