[SCM] cute multiplayer platform game with bunnies branch, master, updated. 8dd60b63c4bb86384f88c59088e20c5c3d4a3941

[Ansgar Burchardt]

The following commit has been merged in the master branch:
commit e80b9d5be41f679c9c22cbf10e9b22258fc63baa
Author: Ansgar Burchardt <ansgar at 2008.43-1.org>
Date:   Tue Mar 3 00:17:31 2009 +0100

    Use Makefile to install jumpnbump-menu

diff --git a/debian/contrib/jumpnbump_menu/Makefile b/debian/contrib/jumpnbump_menu/Makefile
index 454c5e2..2b83be2 100644
--- a/debian/contrib/jumpnbump_menu/Makefile
+++ b/debian/contrib/jumpnbump_menu/Makefile
@@ -1,11 +1,15 @@
-PREFIX=/usr
+PREFIX ?= /usr
 
 all:
 	@echo "This software is interpreted, no compilation needed"
+
+clean:
+
 install:
-	cp jumpnbump_menu.glade $(PREFIX)/share/games/jumpnbump/
-	cp jumpnbump_menu.py $(PREFIX)/games/
+	install -o root -g root -m 644 jumpnbump_menu.glade $(PREFIX)/share/games/jumpnbump/
+	install -o root -g root -m 755 jumpnbump_menu.py $(PREFIX)/games/jumpnbump-menu
 
 uninstall:
 	rm $(PREFIX)/share/games/jumpnbump/jumpnbump_menu.glade
-	rm $(PREFIX)/games/jumpnbump_menu.py
+	rm $(PREFIX)/games/jumpnbump-menu
+
diff --git a/debian/dirs b/debian/dirs
index 89e7b4b..a189e93 100644
--- a/debian/dirs
+++ b/debian/dirs
@@ -2,4 +2,6 @@ usr/games
 usr/lib/jumpnbump
 usr/share/applications
 usr/share/games/jumpnbump
+usr/share/man/man6
 usr/share/pixmaps
+
diff --git a/debian/rules b/debian/rules
index 02b73c3..9193055 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,6 +18,7 @@ build-stamp: $(QUILT_STAMPFN)
 	dh_testdir
 
 	$(MAKE) PREFIX=/usr all data
+	$(MAKE) -C debian/contrib/jumpnbump_menu PREFIX=/usr all
 
 	touch build-stamp
 
@@ -27,6 +28,7 @@ clean: unpatch
 	rm -f build-stamp configure-stamp
 
 	[ ! -f Makefile ] || $(MAKE) clean
+	$(MAKE) -C debian/contrib/jumpnbump_menu clean
 	rm -f data/font.gob
 
 	dh_clean
@@ -46,10 +48,9 @@ install: build
 	install -o root -g root -m 755 -d $(CURDIR)/debian/jumpnbump/usr/share/games/jumpnbump
 	install -o root -g root -m 644 debian/jumpnbump.xpm $(CURDIR)/debian/jumpnbump/usr/share/pixmaps/jumpnbump.xpm
 	install -o root -g root -m 644 debian/jumpnbump.desktop $(CURDIR)/debian/jumpnbump/usr/share/applications/jumpnbump.desktop
-	install -o root -g root -m 644 debian/contrib/jumpnbump_menu/jumpnbump_menu.glade $(CURDIR)/debian/jumpnbump/usr/share/games/jumpnbump/
 	install -o root -g root -m 644 data/jumpbump.dat $(CURDIR)/debian/jumpnbump/usr/share/games/jumpnbump/
-	install -o root -g root -m 755 -d $(CURDIR)/debian/jumpnbump/usr/share/man/man6
-	install -o root -g root -m 755 debian/contrib/jumpnbump_menu/jumpnbump_menu.py $(CURDIR)/debian/jumpnbump/usr/games/jumpnbump-menu
+
+	$(MAKE) -C debian/contrib/jumpnbump_menu PREFIX=$(CURDIR)/debian/jumpnbump/usr install
 
 	# Man page links
 	ln -s jumpnbump.6.gz $(CURDIR)/debian/jumpnbump/usr/share/man/man6/jumpnbump.svgalib.6.gz

-- 
cute multiplayer platform game with bunnies