enable use of test suite during build, only for the simple case .. not LDAP

[debian/sudo] / debian / rules

diff --git a/debian/rules b/debian/rules
index 2f665ff5cfae8519f99f68031f7c8aa9dfa4ab87..8eea4069a24025ffb809621ecbea50451c2151f3 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -31,13 +31,11 @@ configure-stamp:
                --with-timeout=15 \
                --with-password-timeout=0 \
                --with-passprompt="[sudo] password for %p: " \
-               --with-timedir=/var/lib/sudo \
                --disable-root-mailer \
-               --disable-setresuid \
                --with-sendmail=/usr/sbin/sendmail \
+               --with-timedir=/var/lib/sudo \
                --mandir=/usr/share/man \
-               --libexecdir=/usr/lib/sudo \
-               --with-secure-path="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/X11R6/bin"
+               --libexecdir=/usr/lib/sudo
 
        # LDAP version
        mkdir -p build-ldap
@@ -65,16 +63,20 @@ configure-stamp:
 
        touch configure-stamp
 
-build: build-stamp
+build: build-arch build-indep
+build-arch: build-stamp
+build-indep: build-stamp
 build-stamp: configure-stamp
        dh_testdir
 
        # ensure our pod changes get picked up
-       $(MAKE) sudoers.man.in sudo.man.in visudo.man.in
+       $(MAKE) -C doc sudoers.man.in sudo.man.in visudo.man.in
 
        $(MAKE) -C build-simple
        $(MAKE) -C build-ldap
 
+       $(MAKE) -C build-simple check
+
        touch build-stamp
 
 clean:
@@ -131,7 +133,7 @@ binary-arch: build install
        dh_testdir
        dh_testroot
        dh_installdocs -A
-       dh_installexamples -A sample.sudoers
+       dh_installexamples -A doc/sample.sudoers
        dh_installinit -psudo -psudo-ldap --name=sudo
        dh_installman -A
        dh_installinfo -A
@@ -150,4 +152,4 @@ binary-arch: build install
        dh_builddeb
 
 binary: binary-indep binary-arch
-.PHONY: configure build clean binary-indep binary-arch binary install
+.PHONY: configure build-indep build-arch build clean binary-indep binary-arch binary install