Support `range' operator, as promised by the spec. Closes:#686449. Bug and analysis...

[userv.git] / debian / rules

diff --git a/debian/rules b/debian/rules
index 05edd5f77fbae685c591fd46de5fa60a5ccd6e5a..67c5271261ee8be0febdcd6e932fbacf9331527b 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -11,20 +11,26 @@ else
        INSTOPTS= INSTALL_PROGRAM='install -c'
 endif
 
+makebuildargs := OPTIMISE= \
+ XCFLAGS="$(shell dpkg-buildflags --get CFLAGS)" \
+ XCPPFLAGS="$(shell dpkg-buildflags --get CPPFLAGS)" \
+ XLDFLAGS="$(shell dpkg-buildflags --get LDFLAGS)"
+
 build: build-arch build-indep
 
 build-arch:
        $(checkdir)
        ./configure --prefix=/usr
-       $(MAKE) all docs
+       $(MAKE) $(makebuildargs) all docs
        touch build-arch
 
 clean:
        $(checkdir)
        rm -f build build-arch
        $(MAKE) -i distclean || $(MAKE) -f Makefile.in distclean
-       rm -rf *~ $t debian/*~ debian/files* debian/substvars*
-       rm -rf spec.html
+       rm -rf *~ $t
+       rm -rf spec.html spec.ps debian/substvars*
+       dh_clean
 
 build-indep:
 binary-indep:
@@ -39,7 +45,7 @@ binary-arch:  checkroot build
        install -m 755 debian/{postinst,prerm,postrm} $t/DEBIAN/.
        install -m 644 debian/conffiles $t/DEBIAN/.
        install -m 755 debian/initd $t/etc/init.d/userv
-       $(MAKE) $(INSTOPTS) \
+       $(MAKE) $(INSTOPTS) $(makebuildargs) \
                prefix=$t/usr etcdir=$t/etc \
                docdir=$t/usr/share/doc/userv \
                mandir=$t/usr/share/man \
@@ -55,8 +61,9 @@ binary-arch:  checkroot build
        cp debian/lintian $t/usr/share/lintian/overrides/userv
        dpkg-shlibdeps daemon client
        dpkg-gencontrol -isp
-       chown -R root.root $t
-       chmod -R og=rX $t
+       dh_fixperms -Pdebian/tmp
+       chown root.root debian/tmp/usr/bin/userv
+       chmod 4755 debian/tmp/usr/bin/userv
        dpkg --build $t ..
 
 define checkdir