[DRE-commits] [SCM] rdtool.git branch, master, updated. debian/0.6.31-1-25-gea4581b

[Taku YASUI]

The following commit has been merged in the master branch:
commit b3206ecd5d52484cba3eda3f0777205f83b71308
Author: Taku YASUI <tach at debian.org>
Date:   Sun May 6 04:08:11 2012 +0900

    Minor fix

diff --git a/debian/rules b/debian/rules
index 4cd92e8..dd3b51a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,13 +8,14 @@ libdir := $(shell ruby -r rbconfig -e 'print RbConfig::CONFIG["vendordir"]')
 
 clean::
 	dh_ruby --clean
+	rm -f debian/rd2.1 debian/rdswap.1 RD2.1 RDSWAP.1
 
 configure/rdtool::
 	dh_ruby --configure
-	#ruby setup.rb config --installdirs=std --librubyver=$(libdir)
 
 build/rdtool::
 	dh_ruby --build
+
 	# Build manuals
 	ruby -Ilib bin/rd2 -rrd/rd2man-lib -oRD2 bin/rd2
 	mv RD2.1 debian/rd2.1
@@ -22,9 +23,11 @@ build/rdtool::
 	mv RDSWAP.1 debian/rdswap.1
 
 install/rdtool::
-	env DH_RUBY_USE_DH_AUTO_INSTALL_DESTDIR=debian/tmp dh_ruby --install debian/tmp
-	#ruby setup.rb install --prefix=$(DEB_DESTDIR)
+	env DH_RUBY_USE_DH_AUTO_INSTALL_DESTDIR=1 dh_ruby --install debian/tmp
 	install -D -m644 lib/rd/dot.rd2rc $(DEB_DESTDIR)/etc/rdtool/rd2rc
 
+	# Remove needless files
+	rm -f $(DEB_DESTDIR)/$(libdir)/rd/dot.rd2rc
+
 install/rdtool-elisp::
 	install -D -m644 utils/rd-mode.el $(DEB_DESTDIR)/usr/share/emacs/site-lisp/$(cdbs_curpkg)/rd-mode.el

-- 
rdtool.git