[rkward] debian-official: Fix installation after package split.

[Thomas Friedrichsmeier]

Git commit e968919bdc715c921377193a314df436fc059941 by Thomas Friedrichsmeier.
Committed on 06/02/2016 at 21:43.
Pushed by tfry into branch 'master'.

Fix installation after package split.

A  +1    -0    debian-official/rkward-data.manpages
M  +6    -3    debian-official/rules

http://commits.kde.org/rkward/e968919bdc715c921377193a314df436fc059941

diff --git a/debian-official/rkward-data.manpages b/debian-official/rkward-data.manpages
new file mode 100644
index 0000000..56c56af
--- /dev/null
+++ b/debian-official/rkward-data.manpages
@@ -0,0 +1 @@
+build/doc/rkward/rkward.1
diff --git a/debian-official/rules b/debian-official/rules
index bc7a25b..491ab34 100755
--- a/debian-official/rules
+++ b/debian-official/rules
@@ -29,6 +29,9 @@ RMINOR = $(shell echo $(RVERS) | awk -F. '{print $$2}')
 # set built-time of GNUR packages to time of created binary package based on stamp in changelog
 builttime = $(shell dpkg-parsechangelog -l$(CURDIR)/debian/changelog | awk -F': ' '/Date/ {print $$2}')
 
+# easier typing
+DESTDIR = $(CURDIR)/debian/tmp
+
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -O0
 else
@@ -94,8 +97,8 @@ install: build
 	dh_prep
 	dh_installdirs
 
-	# Add here commands to install the package into debian/rkward.
-	cd $(CURDIR)/build && $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+	# Install into debian/tmp, first
+	cd $(CURDIR)/build && $(MAKE) install DESTDIR=$(DESTDIR)
 	# dirty hack to get rid of conflicting r.xml file without adjusting all makefiles
 	rm -vf $(DESTDIR)/`kde4-config --install data`/katepart/syntax/r.xml
 	
@@ -120,7 +123,7 @@ binary-arch: build install
 	dh_installdocs
 	dh_installexamples
 	dh_installmenu
-	dh_installman $(CURDIR)/build/doc/rkward/rkward.1
+	dh_installman
 	dh_link
 	dh_strip
 	# do not compress KDE HTML help