[ri-li] 91/93: debian/rules: Fix FTBFS when built with dpkg-buildpackage -A

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo-guest pushed a commit to branch master
in repository ri-li.

commit 14f60a6ae68ef9f784b29c59037255506a921b20
Author: Markus Koschany <apo at debian.org>
Date:   Wed Dec 2 18:17:42 2015 +0100

    debian/rules: Fix FTBFS when built with dpkg-buildpackage -A
    
    Closes: #806872
    Thanks: Santiago Vila for the report.
---
 debian/rules | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/debian/rules b/debian/rules
index 99e4984..906ac12 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,20 +16,20 @@ override_dh_auto_configure:
 		--datadir=/usr/share/games/ri-li \
 		--bindir=/usr/games
 
-override_dh_auto_build-arch:
+override_dh_auto_build:
 	dh_auto_build -Ddata-src
 	cd data-src && xvfb-run --server-args="-screen 0 1024x768x24" ./MakeDat
 	mv data-src/language.* data
 	mv data-src/sprites.dat data
-	dh_auto_build
-
-override_dh_auto_build-indep:
 	convert -monitor -resize 32x32 data-src/pov/Textures/Ri-li.ico ri-li.xpm
 	convert -monitor data-src/pov/Textures/Ri-li.ico $(PNGRBTD) ri-li.png
 
-override_dh_install:
+override_dh_install-arch:
 	mv debian/tmp/usr/games/Ri_li debian/tmp/usr/games/ri-li
-	rm -f debian/tmp/usr/share/games/ri-li/Ri-li/COPYING.Music
+	dh_install
+
+override_dh_install-indep:
+	$(RM) debian/tmp/usr/share/games/ri-li/Ri-li/COPYING.Music
 	dh_install
 
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/ri-li.git