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

Lucas Nussbaum lucas-guest at costa.debian.org
Tue Jan 17 00:10:26 UTC 2006


Author: lucas-guest
Date: 2006-01-17 00:10:25 +0000 (Tue, 17 Jan 2006)
New Revision: 283

Modified:
   tools/ruby-pkg-tools/trunk/1/class/ruby-setup-rb.mk
Log:
Ignore missing setup.rb files.

Some packages don't have setup.rb files (instead, they have extconf.rb, or worse, nothing). If a package doesn't have any setup.rb, this class doesn't crash anymore. I'm not sure this is the right way to handle this: maybe the dh_rdoc stuff should be moved outside of this class so it could be used by packages without setup.rb

Example of package needing this: libgnuplot-ruby


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-16 23:30:49 UTC (rev 282)
+++ tools/ruby-pkg-tools/trunk/1/class/ruby-setup-rb.mk	2006-01-17 00:10:25 UTC (rev 283)
@@ -62,25 +62,37 @@
 
 # Build regular library packages
 $(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
+	cd $(DEB_SRCDIR) ;\
+	if [ -f $(DEB_RUBY_SETUP_CMD) ]; then \
+		/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 ;\
+	fi
 	$(call push_cfg_file,$(cdbs_curpkg))
 
 # Build simple packages
 $(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
+	cd $(DEB_SRCDIR) ;\
+	if [ -f $(DEB_RUBY_SETUP_CMD) ]; then \
+		/usr/bin/ruby $(DEB_RUBY_SETUP_CMD) config $(DEB_RUBY_CONFIG_ARGS) && /usr/bin/ruby $(DEB_RUBY_SETUP_CMD) setup ;\
+	fi
 	$(call push_cfg_file,$(cdbs_curpkg))
 
 
 # Install regular library packages
 $(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)
+	cd $(DEB_SRCDIR) ;\
+	if [ -f $(DEB_RUBY_SETUP_CMD) ]; then \
+		/usr/bin/ruby$(cdbs_ruby_ver) $(DEB_RUBY_SETUP_CMD) install --prefix=debian/$(cdbs_curpkg) ;\
+	fi
 	$(call push_cfg_file,$(cdbs_curpkg))
 
 # Install simple packages
 $(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)
+	cd $(DEB_SRCDIR) ;\
+	if [ -f $(DEB_RUBY_SETUP_CMD) ]; then \
+		/usr/bin/ruby $(DEB_RUBY_SETUP_CMD) install --prefix=debian/$(cdbs_curpkg) ;\
+	fi
 	$(call push_cfg_file,$(cdbs_curpkg))
 
 # Generate rdoc documentation for *-doc packages




More information about the pkg-ruby-extras-maintainers mailing list