[debian-edu-commits] debian-edu/pkg-team/ 25/159: meh, we can’t

[Dominik George]

This is an automated email from the git hooks/post-receive script.

natureshadow-guest pushed a commit to branch master
in repository xrdp.

commit ce023f218943fbabc4971ea1b3d2953177ac0b20
Author: mirabilos <tg at mirbsd.org>
Date:   Wed Aug 5 20:12:53 2015 +0200

    meh, we can’t
---
 rules | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/rules b/rules
index 1393a4f..a77d217 100755
--- a/rules
+++ b/rules
@@ -1,5 +1,25 @@
 #!/usr/bin/make -f
 
+include /usr/share/dpkg/default.mk
+
+# this is precisely what dh_auto_configure does
+CONFIGURE_ARGS:=	--build=${DEB_BUILD_GNU_TYPE} \
+			--prefix=/usr \
+			--includedir=\${prefix}/include \
+			--mandir=\${prefix}/share/man \
+			--infodir=\${prefix}/share/info \
+			--sysconfdir=/etc \
+			--localstatedir=/var \
+			--disable-silent-rules \
+			--libdir=\${prefix}/lib/${DEB_HOST_MULTIARCH} \
+			--libexecdir=\${prefix}/lib/${DEB_HOST_MULTIARCH} \
+			--disable-maintainer-mode \
+			--disable-dependency-tracking
+
+ifneq (${DEB_BUILD_GNU_TYPE},${DEB_HOST_GNU_TYPE})
+CONFIGURE_ARGS+=	--host=${DEB_HOST_GNU_TYPE}
+endif
+
 %:
 	dh $@
 
@@ -7,8 +27,7 @@ override_dh_auto_configure:
 	./bootstrap
 	cd xorgxrdp && ./bootstrap
 	#TODO: kerberos
-	dh_auto_configure -v -- --disable-silent-rules \
-	    --disable-dependency-tracking \
+	./configure ${CONFIGURE_ARGS} \
 	    --enable-ipv6 \
 	    --enable-neutrinordp \
 	    --enable-jpeg \
@@ -16,6 +35,5 @@ override_dh_auto_configure:
 	    --enable-xrdpvr \
 	    --enable-rfxcodec \
 	    --enable-opus
-	cd xorgxrdp && dh_auto_configure -v -- --disable-silent-rules \
-	    --disable-dependency-tracking
+	cd xorgxrdp && ./configure ${CONFIGURE_ARGS}
 	exit 1

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/xrdp.git