*** makefiles/Makefile.nbs.orig	Mon Mar  2 20:04:28 1998
--- makefiles/Makefile.nbs	Mon Mar  2 20:07:29 1998
***************
*** 2,10 ****
  # Makefile for NetBSD 1.2
  # $Id: patch-aa,v 1.2 1998/03/29 21:45:26 tron Exp $
  #
! BINDIR=		/usr/local/bin
! ETCDIR=		/usr/local/libexec
! MANDIR=		/usr/local/man
  MANEXT=		8
  INSTALL=	install
  
--- 2,12 ----
  # Makefile for NetBSD 1.2
  # $Id: patch-aa,v 1.2 1998/03/29 21:45:26 tron Exp $
  #
! PREFIX?=	/usr/pkg
! BINDIR=		${PREFIX}/bin
! ETCDIR=		${PREFIX}/etc
! MANDIR=		${PREFIX}/man
! LIBEXECDIR=	${PREFIX}/libexec
  MANEXT=		8
  INSTALL=	install
  
***************
*** 13,24 ****
  	@ echo 'You can say "build help" for details on how it works.'
  
  install: bin/ftpd bin/ftpcount bin/ftpshut
! 	-mv -f ${ETCDIR}/ftpd ${ETCDIR}/ftpd-old
  	@echo installing binaries.
! 	${INSTALL} -c -o bin -g bin -m 755 bin/ftpd ${ETCDIR}/ftpd
  	${INSTALL} -c -o bin -g bin -m 755 bin/ftpshut ${BINDIR}/ftpshut
  	${INSTALL} -c -o bin -g bin -m 755 bin/ftpcount ${BINDIR}/ftpcount
  	${INSTALL} -c -o bin -g bin -m 755 bin/ftpwho ${BINDIR}/ftpwho
  	@echo installing manpages.
  	${INSTALL} -c -o bin -g bin -m 644 doc/ftpd.8 ${MANDIR}/man8/ftpd.8
  	${INSTALL} -c -o bin -g bin -m 644 doc/ftpcount.1 ${MANDIR}/man1/ftpcount.1
--- 15,31 ----
  	@ echo 'You can say "build help" for details on how it works.'
  
  install: bin/ftpd bin/ftpcount bin/ftpshut
! 	-mv -f ${LIBEXECDIR}/ftpd ${LIBEXECDIR}/ftpd-old
  	@echo installing binaries.
! 	${INSTALL} -c -o bin -g bin -m 755 bin/ftpd ${LIBEXECDIR}/ftpd
  	${INSTALL} -c -o bin -g bin -m 755 bin/ftpshut ${BINDIR}/ftpshut
  	${INSTALL} -c -o bin -g bin -m 755 bin/ftpcount ${BINDIR}/ftpcount
  	${INSTALL} -c -o bin -g bin -m 755 bin/ftpwho ${BINDIR}/ftpwho
+ 	${INSTALL} -c -o bin -g bin -m 755 bin/ckconfig ${BINDIR}/ftpckconfig
+ 	@echo Installing basic configuration
+ 	${INSTALL} -c -o root -g bin -m 644 doc/examples/ftpaccess ${ETCDIR}/ftpaccess.example
+ 	${INSTALL} -c -o root -g bin -m 644 doc/examples/ftpusers ${ETCDIR}/ftpusers.example
+ 	${INSTALL} -c -o root -g bin -m 644 doc/examples/ftpconversions ${ETCDIR}/ftpconversions.example
  	@echo installing manpages.
  	${INSTALL} -c -o bin -g bin -m 644 doc/ftpd.8 ${MANDIR}/man8/ftpd.8
  	${INSTALL} -c -o bin -g bin -m 644 doc/ftpcount.1 ${MANDIR}/man1/ftpcount.1