[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 995d46a45531b83a5886725360dad81f235e6f64
Author: Taku YASUI <tach at debian.org>
Date:   Sat May 5 19:54:55 2012 +0900

    Minor fix for buildsys

diff --git a/debian/rdtool.manpages b/debian/rdtool.manpages
new file mode 100644
index 0000000..b25bc30
--- /dev/null
+++ b/debian/rdtool.manpages
@@ -0,0 +1,2 @@
+debian/rd2.1
+debian/rdswap.1
diff --git a/debian/rules b/debian/rules
index 1c5f2b5..3c84845 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,7 @@
 #!/usr/bin/make -f
 
 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"]')
 
@@ -8,22 +9,20 @@ clean::
 	-ruby setup.rb clean
 
 configure/ruby-rd::
-	ruby setup.rb config --rbdir=$(libdir)
+	ruby setup.rb config
 
 build/rdtool::
-	$(ruby) -Ilib bin/rd2 -rrd/rd2man-lib -oRD2 bin/rd2
+	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
+	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=$(CURDIR)/debian/tmp
-	cp lib/rd/dot.rd2rc $(CURDIR)/debian/tmp$(libdir)/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
 
-	dh_movefiles
-
 install/rdtool-elisp::
 	install -D -m 444 utils/rd-mode.el $(cdbs_curdestdir)/usr/share/emacs/site-lisp/$(cdbs_curpkg)/rd-mode.el

-- 
rdtool.git