prepare to upload

[debian/sudo] / debian / rules

diff --git a/debian/rules b/debian/rules
index b57dae5820499cf5a0a2050a51c21064c9639c4c..3323153f42e5af80513b883902b65a22c2ff608b 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -8,24 +8,32 @@ CFLAGS += -g
 endif
 export CFLAGS
 
-config: config-stamp
-config-stamp:
+configure: configure-stamp
+configure-stamp:
        dh_testdir
+       cp -f /usr/share/misc/config.sub config.sub
+       cp -f /usr/share/misc/config.guess config.guess
 
        # simple version
        mkdir -p build-simple
        cd build-simple && NROFFPROG=/usr/bin/nroff ../configure \
                --prefix=/usr -v \
                --with-all-insults \
-               --with-devel --with-pam --with-fqdn \
-               --with-logging=syslog --with-logfac=authpriv \
-               --with-env-editor --with-editor=/usr/bin/vi \
-               --with-timeout=15 --with-password-timeout=0 \
+               --with-devel \
+               --with-pam \
+               --with-fqdn \
+               --with-logging=syslog \
+               --with-logfac=authpriv \
+               --with-env-editor \
+               --with-editor=/usr/bin/editor \
+               --with-timeout=15 \
+               --with-password-timeout=0 \
                --with-passprompt="[sudo] password for %p: " \
-               --disable-root-mailer --disable-setresuid \
+               --disable-root-mailer \
+               --disable-setresuid \
                --with-sendmail=/usr/sbin/sendmail \
-               --mandir=/usr/share/man --libexecdir=/usr/lib/sudo \
-               --with-ldap-conf-file=/etc/sudo-ldap.conf \
+               --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"
 
        # LDAP version
@@ -33,21 +41,29 @@ config-stamp:
        cd build-ldap && NROFFPROG=/usr/bin/nroff ../configure \
                --prefix=/usr -v \
                --with-all-insults \
-               --with-exempt=sudo --with-pam --with-ldap --with-fqdn \
-               --with-logging=syslog --with-logfac=authpriv \
-               --with-env-editor --with-editor=/usr/bin/vi \
-               --with-timeout=15 --with-password-timeout=0 \
+               --with-devel \
+               --with-pam \
+               --with-ldap \
+               --with-fqdn \
+               --with-logging=syslog \
+               --with-logfac=authpriv \
+               --with-env-editor \
+               --with-editor=/usr/bin/editor \
+               --with-timeout=15 \
+               --with-password-timeout=0 \
                --with-passprompt="[sudo] password for %p: " \
-               --disable-root-mailer --disable-setresuid \
+               --disable-root-mailer \
+               --disable-setresuid \
                --with-sendmail=/usr/sbin/sendmail \
-               --with-ldap-conf-file=/etc/ldap/ldap.conf \
-               --mandir=/usr/share/man --libexecdir=/usr/lib/sudo \
+               --with-ldap-conf-file=/etc/sudo-ldap.conf \
+               --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"
 
        touch config-stamp
 
 build: build-stamp
-build-stamp: config-stamp
+build-stamp: configure-stamp
        dh_testdir
 
        # ensure our pod changes get picked up
@@ -64,12 +80,6 @@ clean:
        rm -f config-stamp build-stamp
        rm -rf build-simple build-ldap
        rm -f config.cache
-
-       -test -r /usr/share/misc/config.sub && \
-               cp -f /usr/share/misc/config.sub config.sub
-       -test -r /usr/share/misc/config.guess && \
-               cp -f /usr/share/misc/config.guess config.guess
-
        dh_clean
 
 install: build-stamp
@@ -103,10 +113,10 @@ binary-arch: build install
        dh_testroot
        dh_installdocs
        dh_installexamples -A sudoers
-       dh_installinit -psudo -psudo-ldap
-       dh_installmanpages fnmatch.3
+       dh_installinit -psudo -psudo-ldap --name=sudo
+       dh_installman
        dh_installinfo -A
-       dh_installchangelogs CHANGES
+       dh_installchangelogs ChangeLog 
        dh_strip
        dh_compress
        dh_fixperms
@@ -119,4 +129,4 @@ binary-arch: build install
        dh_builddeb
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+.PHONY: configure build clean binary-indep binary-arch binary install