Stop passing RSH and MANCONF to configure.

The former was only needed by xsm, the latter by xman, before the
xbase-clients split.
This commit is contained in:
Julien Cristau 2012-01-11 21:02:13 +01:00
parent 301db48f25
commit c181d85a77
2 changed files with 5 additions and 3 deletions

2
debian/changelog vendored
View File

@ -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)

6
debian/rules vendored
View File

@ -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)
>$@