[Pkg-mpd-commits] [SCM] Git repository for pkg-mpd branch, master, updated. debian/0.17.1-1-34-g0e8e443

[Florian Schlichting]

The following commit has been merged in the master branch:
commit 8348034472e66fe31a9788d5de3e7211ac7d6597
Author: Florian Schlichting <fschlich at zedat.fu-berlin.de>
Date:   Fri Feb 22 13:05:27 2013 +0100

    Disable systemd support on non-linux architectures

diff --git a/debian/control b/debian/control
index 0c4abd8..504672a 100644
--- a/debian/control
+++ b/debian/control
@@ -4,6 +4,7 @@ Priority: optional
 Maintainer: mpd maintainers <pkg-mpd-maintainers at lists.alioth.debian.org>
 Uploaders: Florian Schlichting <fschlich at zedat.fu-berlin.de>
 Build-Depends: debhelper (>= 9),
+               dpkg-dev (>= 1.16.1~),
                libao-dev (>= 0.8.3),
                libasound2-dev  [linux-any],
                libaudiofile-dev,
@@ -34,7 +35,7 @@ Build-Depends: debhelper (>= 9),
                libresid-builder-dev,
                libsamplerate0-dev,
                libshout3-dev,
-               libsystemd-daemon-dev,
+               libsystemd-daemon-dev [!hurd-i386 !kfreebsd-amd64 !kfreebsd-i386],
                libsidplay2-dev,
                libsqlite3-dev,
                libvorbis-dev [!arm !armel !armeb],
diff --git a/debian/rules b/debian/rules
index 44b3d3c..f6a76da 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,23 +1,29 @@
 #!/usr/bin/make -f
-ARCH=$(shell dpkg-architecture -qDEB_HOST_ARCH)
+include /usr/share/dpkg/architecture.mk
+
 WITH_TREMOR=
-ifeq ($(ARCH), arm)
+ifeq ($(DEB_HOST_ARCH), arm)
 WITH_TREMOR=--with-tremor
 endif
-ifeq ($(ARCH), armel)
+ifeq ($(DEB_HOST_ARCH), armel)
 WITH_TREMOR=--with-tremor
 endif
-ifeq ($(ARCH), armeb)
+ifeq ($(DEB_HOST_ARCH), armeb)
 WITH_TREMOR=--with-tremor
 endif
 
+WITH_SYSTEMD=
+ifeq ($(DEB_HOST_ARCH_OS), linux)
+WITH_SYSTEMD=--enable-systemd-daemon --with-systemdsystemunitdir=/lib/systemd/system
+endif
+
 LDFLAGS += -Wl,--as-needed
 
 %:
 	dh $@
 
 override_dh_auto_configure:
-	./configure $(WITH_TREMOR) --enable-sqlite \
+	./configure $(WITH_TREMOR) $(WITH_SYSTEMD) --enable-sqlite \
 		--enable-un \
 		--enable-ao \
 		--enable-lastfm \
@@ -27,10 +33,8 @@ override_dh_auto_configure:
 		--enable-mikmod \
 		--enable-soundcloud \
 		--enable-iso9660 \
-		--enable-systemd-daemon \
 		--enable-modplug \
 		--enable-curl \
-		--with-systemdsystemunitdir=/lib/systemd/system \
 		--prefix=/usr \
 		--sysconfdir=/etc
 

-- 
Git repository for pkg-mpd