From c181d85a777f301db306481c359519f4b019b4ca Mon Sep 17 00:00:00 2001
From: Julien Cristau <jcristau@debian.org>
Date: Wed, 11 Jan 2012 21:02:13 +0100
Subject: [PATCH] Stop passing RSH and MANCONF to configure.

The former was only needed by xsm, the latter by xman, before the
xbase-clients split.
---
 debian/changelog | 2 ++
 debian/rules     | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bc611a0..b71cc3e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ x11-xserver-utils (7.6+4) UNRELEASED; urgency=low
   * xset 1.2.2
     + add build-dep on x11proto-core-dev 7.0.17
   * Drop --disable-xprint from configure flags, it's not used anywhere.
+  * Stop passing RSH and MANCONF to configure.  The former was only needed by
+    xsm, the latter by xman, before the xbase-clients split.
 
   [ Moritz Muehlenhoff ]
   * Enable hardened build flags (closes: #655503)
diff --git a/debian/rules b/debian/rules
index 214662e..4bda066 100755
--- a/debian/rules
+++ b/debian/rules
@@ -48,9 +48,9 @@ $(STAMP_DIR)/build-%: $(STAMP_DIR)/genscripts $(STAMP_DIR)/patch
 	cd $*-build && \
 	../$*/configure --prefix=/usr --mandir=\$${prefix}/share/man \
 	                --infodir=\$${prefix}/share/info $(confflags) \
-	                CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" \
-	                RSH=rsh \
-	                MANCONF="/etc/manpath.config"
+	                CFLAGS="$(CFLAGS)" \
+			CPPFLAGS="$(CPPFLAGS)" \
+			LDFLAGS="$(LDFLAGS)"
 	cd $*-build && $(MAKE)
 	>$@