$NetBSD: patch-aa,v 1.1.1.1 2003/05/08 05:07:54 jeremy-c-reed Exp $

--- Makefile.orig	Tue Nov  6 03:58:16 2001
+++ Makefile	Wed Nov  6 00:32:19 2002
@@ -21,11 +21,11 @@
 PROGS	= init halt shutdown killall5 runlevel sulogin last mesg
 endif
 
-BIN_OWNER	= root
-BIN_GROUP	= root
+BIN_OWNER	= $(ROOT_USER)
+BIN_GROUP	= $(ROOT_GROUP)
 BIN_COMBO	= $(BIN_OWNER).$(BIN_GROUP)
 INSTALL		= install -o $(BIN_OWNER) -g $(BIN_GROUP)
-MANDIR		= /usr/share/man
+MANDIR		= /man
 
 # Additional libs for Gnu Libc
 ifneq ($(wildcard /usr/lib/libcrypt.a),)
@@ -89,16 +89,16 @@
 			runlevel shutdown $(ROOT)/sbin
 		# These are not installed by default
 ifeq ($(DEBIAN),)
-		$(INSTALL) -m 555 utmpdump wall $(ROOT)/usr/bin
+		$(INSTALL) -m 555 utmpdump wall $(ROOT)/bin
 endif
-		# $(INSTALL) -m 755 etc/initscript.sample $(ROOT)/etc
-		$(INSTALL) -m 755 mesg last $(ROOT)/usr/bin
+		$(INSTALL) -m 644 initscript.sample $(ROOT)/share/sysvinit
+		$(INSTALL) -m 755 mesg last $(ROOT)/bin
 		cd $(ROOT)/sbin; ln -sf halt reboot; chown $(BIN_COMBO) reboot
 		cd $(ROOT)/sbin; ln -sf halt poweroff; chown $(BIN_COMBO) poweroff
 		cd $(ROOT)/sbin; ln -sf init telinit; chown $(BIN_COMBO) telinit
 		cd $(ROOT)/bin; ln -sf ../sbin/killall5 pidof; chown $(BIN_COMBO) pidof
-		cd $(ROOT)/usr/bin; ln -sf last lastb; chown $(BIN_COMBO) lastb
-		$(INSTALL) -m 644 initreq.h $(ROOT)/usr/include
+		cd $(ROOT)/bin; ln -sf last lastb; chown $(BIN_COMBO) lastb
+		$(INSTALL) -m 644 initreq.h $(ROOT)/include
 		$(INSTALL) -m 644 ../man/*.8 $(ROOT)$(MANDIR)/man8
 		$(INSTALL) -m 644 ../man/*.5 $(ROOT)$(MANDIR)/man5
 ifeq ($(DEBIAN),)
@@ -106,10 +106,3 @@
 endif
 		$(INSTALL) -m 644 ../man/last.1 ../man/lastb.1 ../man/mesg.1 \
 			$(ROOT)$(MANDIR)/man1
-		#
-		# This part is skipped on debian systems, the
-		# debian.preinst script takes care of it.
-		@if [ ! -p /dev/initctl ]; then \
-		 echo "Creating /dev/initctl"; \
-		 rm -f /dev/initctl; \
-		 mknod -m 600 /dev/initctl p; fi