[SCM] mpg123/master: Use dh_auto_configure.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Tue Mar 27 23:44:37 UTC 2012


The following commit has been merged in the master branch:
commit 45bc21e2786d8dd46bca24c444be26f671dd3565
Author: Alessio Treglia <alessio at debian.org>
Date:   Wed Mar 28 01:22:19 2012 +0200

    Use dh_auto_configure.

diff --git a/debian/rules b/debian/rules
index 0ba528a..80393e4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,7 +13,7 @@ ifeq ($(OS),linux)
 WRAPPER_TARGETS += mpg123-alsa
 endif
 
-CONF_COMMON:=--prefix=/usr --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) --enable-static --enable-shared --disable-ltdl-install
+CONF_COMMON:=--enable-static --enable-shared
 
 CONF_i486:=--with-cpu=x86_dither
 CONF_arm:=--with-cpu=generic_nofpu
@@ -55,6 +55,8 @@ else
         CFLAGS += -O2
 endif
 
+export CFLAGS
+export LDFLAGS
 
 #export DH_VERBOSE=1
 
@@ -84,15 +86,14 @@ build-stamp: configure mpg123
 	touch build-stamp
 
 configure: configure-stamp
+	dh_testdir
+	dh_auto_configure -- $(CONF_COMMON) $(CONF_$(ARCH))
+
 configure-stamp:
 	dh_testdir
 
 	dh_autoreconf --verbose
 
-	CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
-	  ./configure $(CONF_COMMON) $(CONF_$(ARCH)) || \
-	    { ret=$?; cat config.log; exit $$ret; }
-
 	touch configure-stamp
 
 clean:

-- 
mpg123 packaging



More information about the pkg-multimedia-commits mailing list