[DRE-commits] [SCM] rdtool.git branch, master, updated. upstream/0.6.22-28-gf8749af

[Taku YASUI]

The following commit has been merged in the master branch:
commit 7e785c98aee10860111c1c4d226bfa86639b0e5a
Author: Taku YASUI <tach at debian.org>
Date:   Sat May 5 20:08:47 2012 +0900

    Fix for build test

diff --git a/debian/rules b/debian/rules
index a126c63..ab732c6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,33 +3,23 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
-libdir   := $(shell ruby -r rbconfig -e 'print RbConfig::CONFIG["vendordir"]')
+libdir := $(shell ruby -r rbconfig -e 'print RbConfig::CONFIG["vendordir"]')
 
 clean::
-	echo $(cdbs_curdestdir)
 	-ruby setup.rb clean
 
-configure/ruby-rd::
-	echo $(cdbs_curdestdir)
-	ruby setup.rb config
+configure/rdtool::
+	ruby setup.rb config --installdirs=std --librubyver=$(libdir)
 
 build/rdtool::
-	echo $(cdbs_curdestdir)
 	ruby -Ilib bin/rd2 -rrd/rd2man-lib -oRD2 bin/rd2
 	mv RD2.1 debian/rd2.1
 	ruby -Ilib bin/rd2 -rrd/rd2man-lib -oRDSWAP debian/rdswap.rd
 	mv RDSWAP.1 debian/rdswap.1
 
-install/ruby-rd::
-	ruby setup.rb install --prefix=$(cdbs_curdestdir)/usr
-	#cp lib/rd/dot.rd2rc $(CURDIR)/debian/tmp$(libdir)/rd/
-
-	install -d $(CURDIR)/debian/tmp/usr/share/man/man1
-	install -m644 debian/*.1 $(CURDIR)/debian/tmp/usr/share/man/man1
-
 install/rdtool::
-	echo $(cdbs_curdestdir)
+	ruby setup.rb install --prefix=$(DEB_DESTDIR)/usr
+	#cp lib/rd/dot.rd2rc $(CURDIR)/debian/tmp$(libdir)/rd/
 
 install/rdtool-elisp::
-	echo $(cdbs_curdestdir)
-	install -D -m 444 utils/rd-mode.el $(cdbs_curdestdir)/usr/share/emacs/site-lisp/$(cdbs_curpkg)/rd-mode.el
+	install -D -m 444 utils/rd-mode.el $(DEB_DESTDIR)/usr/share/emacs/site-lisp/$(cdbs_curpkg)/rd-mode.el

-- 
rdtool.git