Commit 571d39c3 authored by Axel Beckert's avatar Axel Beckert

debian/rules: Use dh_auto_{configure,build,install}

Also support multiarch lib directories
parent 4cda2f38
...@@ -6,6 +6,9 @@ mp4h (1.3.1-7) UNRELEASED; urgency=low ...@@ -6,6 +6,9 @@ mp4h (1.3.1-7) UNRELEASED; urgency=low
* Remove manual DEB_BUILD_OPTIONS check around dh_strip as dh_strip does * Remove manual DEB_BUILD_OPTIONS check around dh_strip as dh_strip does
that itself. that itself.
* Bump debhelper compatibility to 9 * Bump debhelper compatibility to 9
* Revamp debian/rules:
+ Use dh_auto_{configure,build,install}
+ Support multiarch lib directories
-- Axel Beckert <abe@debian.org> Thu, 29 Dec 2011 15:42:25 +0100 -- Axel Beckert <abe@debian.org> Thu, 29 Dec 2011 15:42:25 +0100
......
...@@ -3,20 +3,6 @@ ...@@ -3,20 +3,6 @@
# Uncomment this to turn on verbose mode. # Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1 #export DH_VERBOSE=1
export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
confflags += --build $(DEB_HOST_GNU_TYPE)
else
confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
endif
CFLAGS := -O2 -Wall
ifneq "$(findstring debug,$(DEB_BUILD_OPTIONS))" ""
CFLAGS += -g
endif
include /usr/share/quilt/quilt.make include /usr/share/quilt/quilt.make
build: build-arch build-indep build: build-arch build-indep
...@@ -24,7 +10,7 @@ build-arch: build-stamp ...@@ -24,7 +10,7 @@ build-arch: build-stamp
build-indep: build-stamp build-indep: build-stamp
build-stamp: configure-stamp build-stamp: configure-stamp
dh_testdir dh_testdir
$(MAKE) dh_auto_build
touch build-stamp touch build-stamp
# aclocal (called from autoreconf) finds gettext *.m4 files # aclocal (called from autoreconf) finds gettext *.m4 files
...@@ -52,7 +38,7 @@ configure-stamp: $(QUILT_STAMPFN) ...@@ -52,7 +38,7 @@ configure-stamp: $(QUILT_STAMPFN)
ACLOCAL=aclocal-1.9 AUTOMAKE=automake-1.9 dh_autoreconf ACLOCAL=aclocal-1.9 AUTOMAKE=automake-1.9 dh_autoreconf
CFLAGS="$(CFLAGS)" ./configure $(confflags) \ dh_auto_configure -- \
--without-included-ltdl \ --without-included-ltdl \
--prefix=/usr \ --prefix=/usr \
--mandir='$${prefix}/share/man' \ --mandir='$${prefix}/share/man' \
...@@ -96,9 +82,9 @@ install: build-stamp ...@@ -96,9 +82,9 @@ install: build-stamp
dh_testdir dh_testdir
dh_testroot dh_testroot
dh_prep dh_prep
$(MAKE) install DESTDIR=$(CURDIR)/debian/mp4h dh_auto_install
sed -e "/dependency_libs/ s/'.*'/''/" \ sed -e "/dependency_libs/ s/'.*'/''/" \
-i "$(CURDIR)/debian/mp4h/usr/lib/mp4h/1.3.1/intl/gettext.la" -i "`find $(CURDIR)/debian/mp4h/usr/lib -name gettext.la`"
binary: binary-arch binary-indep binary: binary-arch binary-indep
...@@ -107,11 +93,7 @@ binary-arch: build install ...@@ -107,11 +93,7 @@ binary-arch: build install
dh_testroot dh_testroot
dh_installdocs README README.pcre CREDITS doc/mp4h.html dh_installdocs README README.pcre CREDITS doc/mp4h.html
dh_installchangelogs ChangeLog dh_installchangelogs ChangeLog
-rmdir \ -find $(CURDIR)/debian/mp4h -type d -empty -delete
$(CURDIR)/debian/mp4h/usr/share/mp4h/WML \
$(CURDIR)/debian/mp4h/usr/share/mp4h/system \
$(CURDIR)/debian/mp4h/usr/lib/mp4h/1.3.1/system \
$(CURDIR)/debian/mp4h/usr/lib/mp4h/1.3.1/javascript
dh_strip dh_strip
dh_compress dh_compress
dh_fixperms dh_fixperms
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment