Get lookup result wrong. Err msgs clarified.

[chiark-utils.git] / debian / rules

diff --git a/debian/rules b/debian/rules
index 5c5ea516a21afda8cf0fa9b60530c11ec6713375..8cc2a66911d376f1160e741e3d8683d07969dd98 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,8 +1,9 @@
 #!/usr/bin/make -f
 
+subdirs=       backup
 package=       chiark-utils
-packages_indep=        chiark-backup chiark-rwbuffer
-packages_arch= chiark-backup chiark-rwbuffer
+packages_indep=        chiark-backup
+packages_arch= chiark-rwbuffer
 packages=      $(packages_indep) $(packages_arch)
 
 cwd=   $(shell pwd)
@@ -11,73 +12,69 @@ t=  $d/tmp
 
 build:
        $(checkdir)
-       $(MAKE) -C backup all
+       set -e; for s in $(subdirs); do $(MAKE) -C $$s all; done
        touch build
 
 clean:
        $(checkdir)
-       -rm -f build
-       -$(MAKE) -i distclean || $(MAKE) -f Makefile.in distclean
-       -rm -rf *~ debian/tmp debian/*~ debian/files* debian/substvars*
+       rm -f build
+       set -e; for s in $(subdirs); do \
+               $(MAKE) -C $$s -i distclean || \
+               $(MAKE) -C $$s -f Makefile.in distclean; \
+       done
+       rm -rf *~ debian/tmp debian/*~ debian/files* debian/substvars*
 
 binary-prep:
        $(checkdir)
-       -rm -rf debian/tmp*
-       -#
+       rm -rf debian/tmp*
+       #
        set -e; for p in $(packages); do \
-               install -d $t/$$p/DEBIAN $t/usr/share/doc/$$p; \
+               install -d $t/$$p/DEBIAN $t/$$p/usr/share/doc/$$p; \
                cp debian/copyright debian/changelog \
                        $t/$$p/usr/share/doc/$$p; \
-               ln -s changelog.gz $t/usr/share/doc/$$p/changelog.Debian.gz; \
-               gzip -9v $t/usr/share/doc/$$p/changelog; \
+               ln -s changelog.gz \
+                       $t/$$p/usr/share/doc/$$p/changelog.Debian.gz; \
+               gzip -9v $t/$$p/usr/share/doc/$$p/changelog; \
                done
-       -#
-       $(MAKE) -C backup install prefix=$t/chiark-backup
-       -#
+       #
+       $(MAKE) -C backup install install-docs install-examples \
+               prefix=$t/chiark-backup/usr \
+               etcdir=$t/chiark-backup/etc \
+               varlib=$t/chiark-backup/var/lib \
+               mandir=$t/chiark-backup/usr/share/man
+       #
        install -d $t/chiark-rwbuffer/usr/bin
+       install -d $t/chiark-rwbuffer/usr/share/man/man1
        cd $t/chiark-backup/usr/bin && \
-        mv readbuffer writebuffer $t/chiark-rwbuffer/usr/bin
+               mv readbuffer writebuffer $t/chiark-rwbuffer/usr/bin
+       cd $t/chiark-backup/usr/share/man/man1 && \
+               mv readbuffer.1 writebuffer.1 $t/chiark-rwbuffer/usr/share/man/man1
+       gzip -9f $t/*/usr/share/man/man*/*
 
 binary-hook-chiark-backup:
 binary-hook-chiark-rwbuffer:
 
 binary-one:
-       dpkg-gencontrol -p$p -O$t/$p -Tdebian/sv-$p
+       set -e; for f in preinst postinst prerm postrm conffiles; do \
+               test -f debian/$p/$$f || continue; \
+               cp debian/$p/$$f $t/$p/DEBIAN/$$f; \
+               chmod u=rwX,go=rX $t/$p/DEBIAN/$$f; \
+       done
+       dpkg-gencontrol -p$p -P$t/$p -Tdebian/sv-$p
        chown -R root.root debian/tmp
        chmod -R g-ws debian/tmp
        debian/rules binary-hook-$p
        dpkg --build $t/$p ..
 
 binary-indep:  checkroot build binary-prep
-       install -d debian/tmp/var/run/$(package)/
-       cp debian/{postinst,prerm,postrm,conffiles} debian/tmp/DEBIAN/.
-       cp debian/initd debian/tmp/etc/init.d/userv
-       chmod +x debian/tmp/DEBIAN/{postinst,prerm,postrm}
-       chmod +x debian/tmp/etc/init.d/userv
-       $(MAKE) LDFLAGS=-s INSTALL_PROGRAM='install -c -s' \
-               prefix=debian/tmp/usr etcdir=debian/tmp/etc \
-               docdir=debian/tmp/usr/doc/userv \
-               install install-doc
-       cp debian/copyright debian/tmp/usr/doc/$(package)/.
-       cp debian/changelog debian/tmp/usr/doc/$(package)/changelog
-       cp README debian/tmp/usr/doc/$(package)/README.upstream
-       cp system.default system.override debian/tmp/usr/doc/$(package)/examples
-       ln -s changelog.gz debian/tmp/usr/doc/$(package)/changelog.Debian.gz
-       gzip -9v debian/tmp/usr/doc/$(package)/changelog debian/tmp/usr/man/man1/*.1
-       rm debian/tmp/usr/doc/userv/*.ps
-       dpkg-shlibdeps daemon client
-       dpkg-gencontrol
-       chown -R root.root debian/tmp
-       chmod -R g-ws debian/tmp
-       chmod 700 debian/tmp/var/run/userv
-       dpkg --build debian/tmp ..
-       $(checkdir)
+       set -e; for p in $(packages_indep); do \
+               debian/rules binary-one p=$$p; done
 
 binary-arch:   checkroot build binary-prep
        $(checkdir)
-       rm debian/tmp/usr/doc/userv/*.ps
-       dpkg-shlibdeps -Tdebian/sv-chiark-backup $t/chiark-backup/usr/bin/*
-       set -e; for p $(packages_arch); do debian/rules binary-one p=$$p; done
+       dpkg-shlibdeps -Tdebian/sv-chiark-rwbuffer $t/chiark-rwbuffer/usr/bin/*
+       set -e; for p in $(packages_arch); \
+               do debian/rules binary-one p=$$p; done
 
 define checkdir
        test -f backup/writebuffer.c