r11546 - packages/trunk/xmahjongg/debian

[Peter Pentchev]

Author: roam-guest
Date: 2010-12-02 18:47:26 +0000 (Thu, 02 Dec 2010)
New Revision: 11546

Modified:
   packages/trunk/xmahjongg/debian/changelog
   packages/trunk/xmahjongg/debian/rules
Log:
Let debhelper's dh_auto_configure and dh_auto_install Do The Right Thing(tm).


Modified: packages/trunk/xmahjongg/debian/changelog
===================================================================
--- packages/trunk/xmahjongg/debian/changelog	2010-12-02 17:48:42 UTC (rev 11545)
+++ packages/trunk/xmahjongg/debian/changelog	2010-12-02 18:47:26 UTC (rev 11546)
@@ -16,6 +16,7 @@
   * Remove a trailing space in the 01-autotools patch.
   * Use the hardening-includes package instead of hardening-wrapper so that
     the hardening flags are visible in CFLAGS and CXXFLAGS.
+  * Let debhelper's dh_auto_configure and dh_auto_install DTRT.
 
  -- Peter Pentchev <roam at ringlet.net>  Mon, 29 Nov 2010 17:18:09 +0200
 

Modified: packages/trunk/xmahjongg/debian/rules
===================================================================
--- packages/trunk/xmahjongg/debian/rules	2010-12-02 17:48:42 UTC (rev 11545)
+++ packages/trunk/xmahjongg/debian/rules	2010-12-02 18:47:26 UTC (rev 11546)
@@ -29,13 +29,10 @@
 export CFLAGS CXXFLAGS
 
 override_dh_auto_configure:
-	./configure --prefix=/usr --mandir=/usr/share/man --datadir=/usr/share/games
+	dh_auto_configure -- --bindir=/usr/games --datadir=/usr/share/games
 	# Avoid rebuilding config.h.in
 	touch config.h.in && touch configure && touch config.status
 
-override_dh_auto_install:
-	$(MAKE) install prefix=$D/usr bindir=$D/usr/games mandir=$D/usr/share/man datadir=$D/usr/share/games
-
 override_dh_installchangelogs:
 	dh_installchangelogs NEWS