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

[Lucas Nussbaum]

Author: lucas-guest
Date: 2006-01-17 07:59:19 +0000 (Tue, 17 Jan 2006)
New Revision: 287

Modified:
   tools/ruby-pkg-tools/trunk/1/class/ruby-setup-rb.mk
Log:
Reverted changes to ruby-setup.mk

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-17 01:19:51 UTC (rev 286)
+++ tools/ruby-pkg-tools/trunk/1/class/ruby-setup-rb.mk	2006-01-17 07:59:19 UTC (rev 287)
@@ -62,37 +62,25 @@
 
 # Build regular library packages
 $(patsubst %,build/%,$(DEB_RUBY_REAL_LIB_PACKAGES)) :: build/% :
-	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
+	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
 	$(call push_cfg_file,$(cdbs_curpkg))
 
 # Build simple packages
 $(patsubst %,build/%,$(DEB_RUBY_SIMPLE_PACKAGES)) :: build/% :
-	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
+	cd $(DEB_SRCDIR) && /usr/bin/ruby $(DEB_RUBY_SETUP_CMD) config $(DEB_RUBY_CONFIG_ARGS) && /usr/bin/ruby $(DEB_RUBY_SETUP_CMD) setup
 	$(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) ;\
-	if [ -f $(DEB_RUBY_SETUP_CMD) ]; then \
-		/usr/bin/ruby$(cdbs_ruby_ver) $(DEB_RUBY_SETUP_CMD) install --prefix=debian/$(cdbs_curpkg) ;\
-	fi
+	cd $(DEB_SRCDIR) && /usr/bin/ruby$(cdbs_ruby_ver) $(DEB_RUBY_SETUP_CMD) install --prefix=debian/$(cdbs_curpkg)
 	$(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) ;\
-	if [ -f $(DEB_RUBY_SETUP_CMD) ]; then \
-		/usr/bin/ruby $(DEB_RUBY_SETUP_CMD) install --prefix=debian/$(cdbs_curpkg) ;\
-	fi
+	cd $(DEB_SRCDIR) && /usr/bin/ruby $(DEB_RUBY_SETUP_CMD) install --prefix=debian/$(cdbs_curpkg)
 	$(call push_cfg_file,$(cdbs_curpkg))
 
 # Generate rdoc documentation for *-doc packages