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 3c3305cdeccf2481a50b3dbb65ca2f1cef7309a1..8eea4069a24025ffb809621ecbea50451c2151f3 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -2,9 +2,11 @@
 
 export DH_VERBOSE=1
 
-CFLAGS = -O2 -Wall -Wno-comment
-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
-CFLAGS += -g
+CFLAGS = -Wall -Wno-comment -g
+ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
+    CFLAGS += -O0
+else
+    CFLAGS += -O2
 endif
 export CFLAGS
 
@@ -16,7 +18,7 @@ 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 \
@@ -30,15 +32,14 @@ configure-stamp:
                --with-password-timeout=0 \
                --with-passprompt="[sudo] password for %p: " \
                --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
-       cd build-ldap && NROFFPROG=/usr/bin/nroff ../configure \
+       cd build-ldap && NROFFPROG=/usr/bin/nroff $(CURDIR)/configure \
                --prefix=/usr -v \
                --with-all-insults \
                --with-devel \
@@ -60,24 +61,28 @@ configure-stamp:
                --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
+       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) -C build-simple 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:
        dh_testdir
        dh_testroot
-       rm -f config-stamp build-stamp
+       rm -f configure-stamp build-stamp
        rm -rf build-simple build-ldap
        rm -f config.cache
        dh_clean
@@ -85,15 +90,21 @@ 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   debian/sudo/etc/sudoers \
-               debian/sudo-ldap/etc/sudoers
+       rm -f   debian/sudo*/etc/sudoers \
+               debian/sudo*/usr/share/doc/sudo/LICENSE* \
+               debian/sudo*/usr/share/doc/sudo/ChangeLog
+
+       # move upstream-installed docs to the right place for ldap package
+       mv      debian/sudo-ldap/usr/share/doc/sudo/* \
+               debian/sudo-ldap/usr/share/doc/sudo-ldap/
+       rmdir   debian/sudo-ldap/usr/share/doc/sudo
 
        # and install things we do want that make install doesn't know about
        install -o root -g root -m 0644 debian/sudo.pam \
@@ -106,6 +117,11 @@ install: build-stamp
        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/sudoers \
+               debian/sudo/etc/sudoers
+       install -o root -g root -m 0440 debian/sudoers \
+               debian/sudo-ldap/etc/sudoers
+
        install -o root -g root -m 0440 debian/README \
                debian/sudo/etc/sudoers.d/README
        install -o root -g root -m 0440 debian/README \
@@ -116,10 +132,10 @@ binary-indep: build install
 binary-arch: build install
        dh_testdir
        dh_testroot
-       dh_installdocs
-       dh_installexamples -A sudoers
+       dh_installdocs -A
+       dh_installexamples -A doc/sample.sudoers
        dh_installinit -psudo -psudo-ldap --name=sudo
-       dh_installman
+       dh_installman -A
        dh_installinfo -A
        dh_installchangelogs ChangeLog 
        dh_strip
@@ -136,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