X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=debian%2Frules;h=bdd1fa991a2563431d219f62e07b745a69a62fc3;hb=bdd946ea99a0d6d8fe0898ccdf0eec34aa63fcbe;hp=569161e7fc5a7671e9f8fe66f95141003ff9d6b7;hpb=e9be60c490674ee7590f8a241a51e6b8317b894c;p=userv.git

diff --git a/debian/rules b/debian/rules
index 569161e..bdd1fa9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,6 +2,14 @@
 
 package=userv
 
+t=debian/tmp
+
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+	INSTOPTS= LDFLAGS=-s INSTALL_PROGRAM='install -c -s'
+else
+	INSTOPTS= INSTALL_PROGRAM='install -c'
+endif
+
 build:
 	$(checkdir)
 	./configure --prefix=/usr
@@ -12,7 +20,8 @@ clean:
 	$(checkdir)
 	-rm -f build
 	-$(MAKE) -i distclean || $(MAKE) -f Makefile.in distclean
-	-rm -rf *~ debian/tmp debian/*~ debian/files* debian/substvars*
+	-rm -rf *~ $t debian/*~ debian/files* debian/substvars*
+	-rm -rf spec.html
 
 binary-indep:	checkroot build
 	$(checkdir)
@@ -22,32 +31,35 @@ binary-indep:	checkroot build
 
 binary-arch:	checkroot build
 	$(checkdir)
-	-rm -rf debian/tmp
-	install -d debian/tmp/{DEBIAN,etc/init.d} debian/tmp/usr/{sbin,bin}
-	install -d debian/tmp/etc/userv/{override,default}.d
-	install -d debian/tmp/usr/doc/$(package)/examples/
-	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 \
+	-rm -rf $t
+	install -d $t/{DEBIAN,etc/init.d} $t/usr/{sbin,bin}
+	install -d $t/etc/userv/{override,default}.d
+	install -d $t/usr/share/doc/$(package)/examples/
+	install -d $t/var/run/$(package)/
+	install -d $t/usr/share/lintian/overrides/
+	cp debian/{postinst,prerm,postrm,conffiles} $t/DEBIAN/.
+	cp debian/initd $t/etc/init.d/userv
+	chmod 755 $t/DEBIAN/{postinst,prerm,postrm}
+	chmod 755 $t/etc/init.d/userv
+	$(MAKE) $(INSTOPTS) \
+		prefix=$t/usr etcdir=$t/etc \
+		docdir=$t/usr/share/doc/userv \
+		mandir=$t/usr/share/man \
 		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
+	cp debian/copyright $t/usr/share/doc/$(package)/.
+	cp debian/changelog $t/usr/share/doc/$(package)/changelog
+	cp README $t/usr/share/doc/$(package)/README.upstream
+	cp system.default system.override $t/usr/share/doc/$(package)/examples
+	ln -s changelog.gz $t/usr/share/doc/$(package)/changelog.Debian.gz
+	gzip -9v $t/usr/share/doc/$(package)/changelog \
+		$t/usr/share/man/man1/*.1 $t/usr/share/doc/userv/*.ps
+	cp debian/lintian $t/usr/share/lintian/overrides/userv
 	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 ..
+	dpkg-gencontrol -isp
+	chown -R root.root $t
+	chmod -R og=rX $t
+	chmod 700 $t/var/run/userv
+	dpkg --build $t ..
 
 define checkdir
 	test -f overlord.c -a -f lexer.l.m4 -a -f debian/rules