one more bug fixed

[debian/sudo] / debian / rules

diff --git a/debian/rules b/debian/rules
index be541be361e91fe72462ad517ad2ea1375df5b87..19362dec7aaab58bfcf01d826f68e81c82035c6b 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -16,33 +16,49 @@ configure-stamp:
 
        # simple version
        mkdir -p build-simple
-       cd build-simple && NROFFPROG=/usr/bin/nroff ../configure \
+       cd build-simple && NROFFPROG=/usr/bin/nroff $(CURDIR)/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/editor \
-               --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 \
+               --with-timedir=/var/lib/sudo \
+               --disable-root-mailer \
+               --disable-setresuid \
                --with-sendmail=/usr/sbin/sendmail \
-               --mandir=/usr/share/man --libexecdir=/usr/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"
 
        # LDAP version
        mkdir -p build-ldap
-       cd build-ldap && NROFFPROG=/usr/bin/nroff ../configure \
+       cd build-ldap && NROFFPROG=/usr/bin/nroff $(CURDIR)/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/sudo-ldap.conf \
-               --mandir=/usr/share/man --libexecdir=/usr/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"
 
        touch config-stamp
@@ -52,7 +68,7 @@ build-stamp: configure-stamp
        dh_testdir
 
        # ensure our pod changes get picked up
-       $(MAKE) -C build-simple sudoers.man.in sudo.man.in visudo.man.in
+       $(MAKE) sudoers.man.in sudo.man.in visudo.man.in
 
        $(MAKE) -C build-simple
        $(MAKE) -C build-ldap
@@ -70,36 +86,43 @@ clean:
 install: build-stamp
        dh_testdir
        dh_testroot
-       dh_clean -k
+       dh_prep
        dh_installdirs
 
        $(MAKE) -C build-simple install DESTDIR=$(CURDIR)/debian/sudo
        $(MAKE) -C build-ldap   install DESTDIR=$(CURDIR)/debian/sudo-ldap
 
        # remove stuff we don't want
-       rm -f   $(CURDIR)/debian/sudo/etc/sudoers \
-               $(CURDIR)/debian/sudo-ldap/etc/sudoers
+       rm -f   debian/sudo/etc/sudoers \
+               debian/sudo-ldap/etc/sudoers \
+               debian/sudo/usr/share/doc/sudo/LICENSE* \
+               debian/sudo-ldap/usr/share/doc/sudo/LICENSE*
 
        # and install things we do want that make install doesn't know about
-       install -o root -g root -m 0644 $(CURDIR)/debian/sudo.pam \
+       install -o root -g root -m 0644 debian/sudo.pam \
                debian/sudo/etc/pam.d/sudo
-       install -o root -g root -m 0644 $(CURDIR)/debian/sudo.pam \
+       install -o root -g root -m 0644 debian/sudo.pam \
                debian/sudo-ldap/etc/pam.d/sudo
 
-       install -o root -g root -m 0644 $(CURDIR)/debian/sudo.lintian \
+       install -o root -g root -m 0644 debian/sudo.lintian \
                debian/sudo/usr/share/lintian/overrides/sudo
-       install -o root -g root -m 0644 $(CURDIR)/debian/sudo-ldap.lintian \
+       install -o root -g root -m 0644 debian/sudo-ldap.lintian \
                debian/sudo-ldap/usr/share/lintian/overrides/sudo-ldap
 
+       install -o root -g root -m 0440 debian/README \
+               debian/sudo/etc/sudoers.d/README
+       install -o root -g root -m 0440 debian/README \
+               debian/sudo-ldap/etc/sudoers.d/README
+
 binary-indep: build install
 
 binary-arch: build install
        dh_testdir
        dh_testroot
-       dh_installdocs
-       dh_installexamples -A sudoers
+       dh_installdocs -A
+       dh_installexamples -A sample.sudoers
        dh_installinit -psudo -psudo-ldap --name=sudo
-       dh_installman
+       dh_installman -A
        dh_installinfo -A
        dh_installchangelogs ChangeLog 
        dh_strip
@@ -107,6 +130,8 @@ binary-arch: build install
        dh_fixperms
        chown root.root debian/sudo/usr/bin/sudo debian/sudo-ldap/usr/bin/sudo
        chmod 4755 debian/sudo/usr/bin/sudo debian/sudo-ldap/usr/bin/sudo
+       chmod 0440      debian/sudo/etc/sudoers.d/README \
+                       debian/sudo-ldap/etc/sudoers.d/README
        dh_installdeb
        dh_shlibdeps
        dh_gencontrol