one more bug fixed
[debian/sudo] / debian / rules
index 2e5f18f7df737961ac14361d688585744f20c8af..19362dec7aaab58bfcf01d826f68e81c82035c6b 100755 (executable)
@@ -8,43 +8,70 @@ CFLAGS += -g
 endif
 export CFLAGS
 
-build: 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 && ../configure --prefix=/usr -v \
+       cd build-simple && NROFFPROG=/usr/bin/nroff $(CURDIR)/configure \
+               --prefix=/usr -v \
                --with-all-insults \
-               --with-exempt=sudo --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 \
-               --disable-root-mailer --disable-setresuid \
+               --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: " \
+               --with-timedir=/var/lib/sudo \
+               --disable-root-mailer \
+               --disable-setresuid \
                --with-sendmail=/usr/sbin/sendmail \
+               --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 && ../configure --prefix=/usr -v \
+       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/editor \
-               --with-timeout=15 --with-password-timeout=0 \
-               --disable-root-mailer --disable-setresuid \
+               --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 \
                --with-sendmail=/usr/sbin/sendmail \
-               --with-ldap-conf-file=/etc/ldap/ldap.conf \
+               --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
 
-       -$(MAKE) -C build-simple
-       -$(MAKE) -C build-ldap
+       # ensure our pod changes get picked up
+       $(MAKE) sudoers.man.in sudo.man.in visudo.man.in
+
+       $(MAKE) -C build-simple
+       $(MAKE) -C build-ldap
 
        touch build-stamp
 
@@ -54,75 +81,57 @@ 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
        dh_testdir
        dh_testroot
-       dh_clean -k
+       dh_prep
        dh_installdirs
 
-       # simple version
-       install -o root -g root -m 4755 -s build-simple/sudo debian/sudo/usr/bin/sudo
-       ln -sf sudo debian/sudo/usr/bin/sudoedit
-       install -o root -g root -m 0755 -s build-simple/visudo \
-               debian/sudo/usr/sbin/visudo
-       install -o root -g root -m 0644 build-simple/sudo.man \
-               debian/sudo/usr/share/man/man8/sudo.8 
-       ln -sf sudo.8 debian/sudo/usr/share/man/man8/sudoedit.8
-       install -o root -g root -m 0644 build-simple/visudo.man \
-               debian/sudo/usr/share/man/man8/visudo.8 
-       install -o root -g root -m 0644 build-simple/sudoers.man \
-               debian/sudo/usr/share/man/man5/sudoers.5 
-       install -o root -g root -m 0644 sample.sudoers \
-               debian/sudo/usr/share/doc/sudo/examples/sudoers
-       install -o root -g root -m 0644 debian/sudo.pam \
-               debian/sudo/etc/pam.d/sudo
+       $(MAKE) -C build-simple install DESTDIR=$(CURDIR)/debian/sudo
+       $(MAKE) -C build-ldap   install DESTDIR=$(CURDIR)/debian/sudo-ldap
 
-       install -o root -g root -m 0644 debian/sudo.lintian \
-               debian/sudo/usr/share/lintian/overrides/sudo
+       # remove stuff we don't want
+       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*
 
-       # LDAP version
-       install -o root -g root -m 4755 -s build-ldap/sudo debian/sudo-ldap/usr/bin/sudo
-       ln -sf sudo debian/sudo-ldap/usr/bin/sudoedit
-       install -o root -g root -m 0755 -s build-ldap/visudo debian/sudo-ldap/usr/sbin/visudo
-       install -o root -g root -m 0644 build-ldap/sudo.man \
-               debian/sudo-ldap/usr/share/man/man8/sudo.8 
-       ln -sf sudo.8 debian/sudo-ldap/usr/share/man/man8/sudoedit.8
-       install -o root -g root -m 0644 build-ldap/visudo.man \
-               debian/sudo-ldap/usr/share/man/man8/visudo.8 
-       install -o root -g root -m 0644 build-ldap/sudoers.man \
-               debian/sudo-ldap/usr/share/man/man5/sudoers.5 
-       install -o root -g root -m 0644 sample.sudoers \
-               debian/sudo-ldap/usr/share/doc/sudo-ldap/examples/sudoers
+       # and install things we do want that make install doesn't know about
+       install -o root -g root -m 0644 debian/sudo.pam \
+               debian/sudo/etc/pam.d/sudo
        install -o root -g root -m 0644 debian/sudo.pam \
                debian/sudo-ldap/etc/pam.d/sudo
 
+       install -o root -g root -m 0644 debian/sudo.lintian \
+               debian/sudo/usr/share/lintian/overrides/sudo
        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
-       dh_installinit -psudo -psudo-ldap
-       dh_installmanpages fnmatch.3
+       dh_installdocs -A
+       dh_installexamples -A sample.sudoers
+       dh_installinit -psudo -psudo-ldap --name=sudo
+       dh_installman -A
        dh_installinfo -A
-       dh_installchangelogs CHANGES
+       dh_installchangelogs ChangeLog 
        dh_strip
        dh_compress
        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
@@ -130,4 +139,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