[DRE-commits] r2422 - tools/ruby-pkg-tools/trunk/1/class

[terceiro-guest at alioth.debian.org]

Author: terceiro-guest
Date: 2008-01-14 16:33:57 +0000 (Mon, 14 Jan 2008)
New Revision: 2422

Modified:
   tools/ruby-pkg-tools/trunk/1/class/ruby-setup-rb.mk
Log:
putting back Arnaud's checks for existing DEB_RUBY_SETUP_CMD, for the cases where the maintainer hardcodes it in debian/rules



Modified: tools/ruby-pkg-tools/trunk/1/class/ruby-setup-rb.mk
===================================================================
--- tools/ruby-pkg-tools/trunk/1/class/ruby-setup-rb.mk	2008-01-14 13:24:15 UTC (rev 2421)
+++ tools/ruby-pkg-tools/trunk/1/class/ruby-setup-rb.mk	2008-01-14 16:33:57 UTC (rev 2422)
@@ -43,12 +43,18 @@
 # targets
 DEB_RUBY_INSTALL_SETUP_CMD = \
 	if [ ! -L $(DEB_RUBY_SETUP_CMD) ] ; then \
+		if [ -f $(DEB_RUBY_SETUP_CMD) ] ; then \
+			mv $(DEB_RUBY_SETUP_CMD) $(DEB_RUBY_SETUP_CMD).moved_away_by_debian_build ;\
+		fi ; \
 		ln -s $(PACKAGED_RUBY_SETUP_CMD) $(DEB_RUBY_SETUP_CMD) ; \
 	fi
 
 DEB_RUBY_REMOVE_SETUP_CMD = \
 	if [ -L $(DEB_RUBY_SETUP_CMD) ] ; then \
 		rm $(DEB_RUBY_SETUP_CMD) ; \
+	fi ; \
+	if [ -f $(DEB_RUBY_SETUP_CMD).moved_away_by_debian_build ] ; then \
+		mv $(DEB_RUBY_SETUP_CMD).moved_away_by_debian_build $(DEB_RUBY_SETUP_CMD) ; \
 	fi
 
 # Build simple packages