[SCM] projectm/master: Make more use of dh-auto commands

[ximion-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 8b8150ad8afaf4dab7b0a7523fb89e2d021df804
Author: Matthias Klumpp <matthias at nlinux.org>
Date:   Wed Mar 23 15:29:54 2011 +0100

    Make more use of dh-auto commands
    
    Replace direct make calls with dh-auto
    commands and simplify debian/rules file.

diff --git a/debian/rules b/debian/rules
index e05164d..39282d5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,21 +1,24 @@
 #!/usr/bin/make -f
 
-# Use this variable to allow options passed to cmake to be overridable
-DEB_CMAKE_OPTIONS ?= -DCMAKE_VERBOSE_MAKEFILE=ON \
-		-DCMAKE_INSTALL_PREFIX="/usr" \
-		-DCMAKE_C_FLAGS="$(DEB_CFLAGS)" \
-		-DINCLUDE-PROJECTM-TEST=OFF \
+# Use this variable to pass configure options for projectM to cmake
+PROJECTM_CMAKE_FLAGS = -DINCLUDE-PROJECTM-TEST=OFF \
 		-DINCLUDE-PROJECTM-JACK=ON
 
-BUILD_DIR=$(CURDIR)/src/build
+# Define install target dir
+INSTALLDIR = $(CURDIR)/debian/tmp
+
+# ProjectM source and build dir
+SRCDIR = $(CURDIR)/src
+BUILDDIR = $(SRCDIR)/build
 
 %:
-	dh $@ --builddirectory=$(BUILD_DIR)
+	dh $@ --list-missing --sourcedirectory=$(SRCDIR) --builddirectory=$(BUILDDIR)
 .PHONY: override_dh_strip
 
 override_dh_auto_clean:
-	[ ! -f $(BUILD_DIR) ] || $(MAKE) --directory=$(BUILD_DIR) clean
-	rm -rf $(BUILD_DIR)
+	dh_auto_clean
+	# Make sure builddir is gone
+	rm -rf $(BUILDDIR)
 
 	# "Make clean" forgets these files
 	rm -f $(CURDIR)/src/libprojectM/libprojectM.pc
@@ -23,12 +26,10 @@ override_dh_auto_clean:
 	rm -f $(CURDIR)/src/projectM-qt/libprojectM-qt.pc
 
 override_dh_auto_configure:
-	mkdir -p $(BUILD_DIR)
-	cd $(BUILD_DIR) && \
-		cmake $(DEB_CMAKE_OPTIONS) ..
+	dh_auto_configure -- $(PROJECTM_CMAKE_FLAGS)
 
 override_dh_auto_install:
-	$(MAKE) --directory=$(BUILD_DIR) install DESTDIR=$(CURDIR)/debian/tmp
+	dh_auto_install --destdir=$(INSTALLDIR)
 
 override_dh_strip:
 	dh_strip --dbg-package=projectm-dbg

-- 
projectm packaging