--- a/debian/rules	Mon Feb 17 17:11:14 2003 +0000
+++ b/debian/rules	Mon Feb 17 17:40:04 2003 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/make -f
-# $Id: rules 441 2003-02-17 17:11:14Z godisch $
+# $Id: rules 442 2003-02-17 17:40:04Z godisch $
 
 #export MAINT_BUILD=1
 
@@ -8,10 +8,8 @@
 DOCDIR   = $(BUILDDIR)/usr/share/doc/noffle
 SPOOLDIR = $(BUILDDIR)/var/spool/noffle
 MANDIR   = $(BUILDDIR)/usr/share/man
-
 testdir  = test -f src/noffle.c -a -f debian/rules
 testroot = test x`whoami` = xroot
-INSTALL  = install -o root -g root
 
 # FOR AUTOCONF 2.13 ONLY
 ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
@@ -67,7 +65,9 @@
 configure: configure-stamp
 configure-stamp:
 	$(testdir)
-	./configure $(CONFFLAGS) --prefix=/usr --mandir=/usr/share/man --with-configfile=/etc/news/noffle.conf --with-usersfile=/etc/news/noffle.users --enable-auth=no
+	./configure $(CONFFLAGS) --prefix=/usr --mandir=/usr/share/man \
+		--with-configfile=/etc/news/noffle.conf \
+		--with-usersfile=/etc/news/noffle.users --enable-auth=no
 	touch configure-stamp
 
 build: build-stamp
@@ -87,70 +87,69 @@
 
 	# installing binaries
 	install -o news -g news -m 6755 -D $(STRIP_FLAG) src/noffle $(BUILDDIR)/usr/bin/noffle
-	$(INSTALL) -m 0755 -D debian/noffle-cronfetch $(BUILDDIR)/usr/sbin/noffle-cronfetch
+	install -o root -g root -m 0755 -D debian/noffle-cronfetch $(BUILDDIR)/usr/sbin/noffle-cronfetch
 
 	# installing locking directory
-	$(INSTALL) -d $(BUILDDIR)/var/lock
-	install -o news -g news -m 2755 -d $(BUILDDIR)/var/lock/noffle
+	install -d -o root -g root -m 0755 $(BUILDDIR)/var/lock
+	install -d -o news -g news -m 2755 $(BUILDDIR)/var/lock/noffle
 
 	# installing spool directories
-	$(INSTALL) -d $(BUILDDIR)/var/spool
-	install -o news -g news -m 2755 -d $(SPOOLDIR)/data $(SPOOLDIR)/outgoing $(SPOOLDIR)/overview $(SPOOLDIR)/requested
+	install -d -o root -g root -m 0755 $(BUILDDIR)/var/spool
+	install -d -o news -g news -m 2755 $(SPOOLDIR)/data $(SPOOLDIR)/outgoing $(SPOOLDIR)/overview $(SPOOLDIR)/requested
 	ln -s ../../lock/noffle $(SPOOLDIR)/lock
 	chown news:news $(SPOOLDIR)/lock
 
 	# installing shared files
-	$(INSTALL) -m 0644 -D debian/linda        $(BUILDDIR)/usr/share/linda/overrides/noffle
-	$(INSTALL) -m 0644 -D debian/lintian      $(BUILDDIR)/usr/share/lintian/overrides/noffle
-	$(INSTALL) -m 0644 -D debian/conf.debian  $(BUILDDIR)/usr/share/noffle/conf.debian
-	$(INSTALL) -m 0644 -D noffle.conf.example $(BUILDDIR)/usr/share/noffle/noffle.conf
-	$(INSTALL) -m 0644 -D debian/slrn.sl      $(BUILDDIR)/usr/share/slrn/macros/noffle.sl
-	$(INSTALL) -m 0644 -D debian/gnus.el      $(BUILDDIR)/usr/share/emacs/site-lisp/gnus/noffle.el
+	install -D -o root -g root -m 0644 debian/linda        $(BUILDDIR)/usr/share/linda/overrides/noffle
+	install -D -o root -g root -m 0644 debian/lintian      $(BUILDDIR)/usr/share/lintian/overrides/noffle
+	install -D -o root -g root -m 0644 debian/conf.debian  $(BUILDDIR)/usr/share/noffle/conf.debian
+	install -D -o root -g root -m 0644 noffle.conf.example $(BUILDDIR)/usr/share/noffle/noffle.conf
+	install -D -o root -g root -m 0644 debian/slrn.sl      $(BUILDDIR)/usr/share/slrn/macros/noffle.sl
+	install -D -o root -g root -m 0644 debian/gnus.el      $(BUILDDIR)/usr/share/emacs/site-lisp/gnus/noffle.el
 
 	# installing manuals
-	$(INSTALL) -d $(MANDIR)/man1 $(MANDIR)/man5
-	sed 's@/etc/noffle\.conf@/etc/news/noffle.conf@g' docs/noffle.1 > $(MANDIR)/man1/noffle.1
+	install -d -o root -g root -m 0755 $(MANDIR)/man1 $(MANDIR)/man5 $(MANDIR)/man8
+	sed 's@/etc/noffle\.conf@/etc/news/noffle.conf@g' docs/noffle.1      > $(MANDIR)/man1/noffle.1
 	sed 's@/etc/noffle\.conf@/etc/news/noffle.conf@g' docs/noffle.conf.5 > $(MANDIR)/man5/noffle.conf.5
 	chown root:root $(MANDIR)/man1/noffle.1 $(MANDIR)/man5/noffle.conf.5
-	chmod 0644 $(MANDIR)/man1/noffle.1 $(MANDIR)/man5/noffle.conf.5
-	$(INSTALL) -m 0644 -D debian/noffle-cronfetch.8 $(MANDIR)/man8/noffle-cronfetch.8
+	chmod 0644      $(MANDIR)/man1/noffle.1 $(MANDIR)/man5/noffle.conf.5
+	install    -o root -g root -m 0644 debian/noffle-cronfetch.8 $(MANDIR)/man8
 	find $(MANDIR) -type f -print0 | xargs -0 gzip -9
 
 	# installing documentation
-	$(INSTALL) -d $(DOCDIR)
-	$(INSTALL) -m 0644 AUTHORS NEWS TODO docs/FAQ docs/INTERNALS docs/NOTES $(DOCDIR)
-	find $(DOCDIR) -type f -size +8 -print0 | xargs -0 gzip -9
-	$(INSTALL) -m 0644 -D debian/changelog $(DOCDIR)/changelog.Debian
-	$(INSTALL) -m 0644 -D ChangeLog $(DOCDIR)/changelog
-	gzip -9 $(DOCDIR)/changelog $(DOCDIR)/changelog.Debian
-	$(INSTALL) -m 0644 debian/copyright $(DOCDIR)
-	$(INSTALL) -m 0644 debian/README.Debian $(DOCDIR)
+	install -d -o root -g root -m 0755 $(DOCDIR)
+	install    -o root -g root -m 0644 AUTHORS NEWS TODO docs/FAQ docs/INTERNALS docs/NOTES $(DOCDIR)
+	install -D -o root -g root -m 0644 debian/changelog     $(DOCDIR)/changelog.Debian
+	install -D -o root -g root -m 0644 ChangeLog            $(DOCDIR)/changelog
+	install    -o root -g root -m 0644 debian/copyright     $(DOCDIR)
+	install    -o root -g root -m 0644 debian/README.Debian $(DOCDIR)
 	ln -s ../../noffle $(DOCDIR)/examples
+	find $(DOCDIR) -type f \( -size +8 -o -name 'changelog*' \) -print0 | xargs -0 gzip -9
 
 	# installing config files
-	$(INSTALL) -d $(BUILDDIR)/etc/news $(BUILDDIR)/etc/default
-	$(INSTALL) -m 0644 -D debian/cron.d     $(BUILDDIR)/etc/cron.d/noffle
-	$(INSTALL) -m 0755 -D debian/cron.daily $(BUILDDIR)/etc/cron.daily/noffle
-	$(INSTALL) -m 0755 -D debian/init       $(BUILDDIR)/etc/init.d/noffle
-	$(INSTALL) -m 0755 -D debian/ip-up      $(BUILDDIR)/etc/ppp/ip-up.d/noffle
-	$(INSTALL) -m 0755 -D debian/ip-down    $(BUILDDIR)/etc/ppp/ip-down.d/noffle
-	$(INSTALL) -m 0644 -D debian/logcheck   $(BUILDDIR)/etc/logcheck/ignore.d.paranoid/noffle
-	$(INSTALL) -m 0644 -D debian/logcheck   $(BUILDDIR)/etc/logcheck/ignore.d.server/noffle
-	$(INSTALL) -m 0644 -D debian/logcheck   $(BUILDDIR)/etc/logcheck/ignore.d.workstation/noffle
+	install -d -o root -g root -m 0755 $(BUILDDIR)/etc/news $(BUILDDIR)/etc/default
+	install -D -o root -g root -m 0644 debian/cron.d     $(BUILDDIR)/etc/cron.d/noffle
+	install -D -o root -g root -m 0755 debian/cron.daily $(BUILDDIR)/etc/cron.daily/noffle
+	install -D -o root -g root -m 0755 debian/init       $(BUILDDIR)/etc/init.d/noffle
+	install -D -o root -g root -m 0755 debian/ip-up      $(BUILDDIR)/etc/ppp/ip-up.d/noffle
+	install -D -o root -g root -m 0755 debian/ip-down    $(BUILDDIR)/etc/ppp/ip-down.d/noffle
+	install -D -o root -g root -m 0644 debian/logcheck   $(BUILDDIR)/etc/logcheck/ignore.d.paranoid/noffle
+	install -D -o root -g root -m 0644 debian/logcheck   $(BUILDDIR)/etc/logcheck/ignore.d.server/noffle
+	install -D -o root -g root -m 0644 debian/logcheck   $(BUILDDIR)/etc/logcheck/ignore.d.workstation/noffle
 
 	# installing packaging information
-	$(INSTALL) -d $(DEBDIR)
-	$(INSTALL) -m 0755 debian/config   $(DEBDIR)
-	$(INSTALL) -m 0644 debian/control  $(DEBDIR)
-	$(INSTALL) -m 0755 debian/postinst $(DEBDIR)
-	$(INSTALL) -m 0755 debian/postrm   $(DEBDIR)
-	$(INSTALL) -m 0755 debian/preinst  $(DEBDIR)
-	$(INSTALL) -m 0755 debian/prerm    $(DEBDIR)
+	install -d -o root -g root -m 0755 $(DEBDIR)
+	install    -o root -g root -m 0755 debian/config   $(DEBDIR)
+	install    -o root -g root -m 0644 debian/control  $(DEBDIR)
+	install    -o root -g root -m 0755 debian/postinst $(DEBDIR)
+	install    -o root -g root -m 0755 debian/postrm   $(DEBDIR)
+	install    -o root -g root -m 0755 debian/preinst  $(DEBDIR)
+	install    -o root -g root -m 0755 debian/prerm    $(DEBDIR)
 	cd $(BUILDDIR) && find usr -type f -print0 | xargs -0 md5sum | tee DEBIAN/md5sums
 	cd $(BUILDDIR) && find ./etc -type f | cut -c 2- | tee DEBIAN/conffiles
 	debconf-mergetemplate debian/templates.?? debian/templates > $(DEBDIR)/templates
 	chown root:root $(DEBDIR)/md5sums $(DEBDIR)/conffiles $(DEBDIR)/templates
-	chmod 0644 $(DEBDIR)/md5sums $(DEBDIR)/conffiles $(DEBDIR)/templates
+	chmod 0644      $(DEBDIR)/md5sums $(DEBDIR)/conffiles $(DEBDIR)/templates
 
 	# building Debian package
 	dpkg-shlibdeps $(BUILDDIR)/usr/bin/noffle