===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/etc/Makefile,v
retrieving revision 1.226
retrieving revision 1.227
diff -c -r1.226 -r1.227
*** src/etc/Makefile	2005/05/26 23:06:06	1.226
--- src/etc/Makefile	2005/08/15 00:40:17	1.227
***************
*** 1,4 ****
! #	$OpenBSD: Makefile,v 1.226 2005/05/26 23:06:06 mcbride Exp $
  
  TZDIR=		/usr/share/zoneinfo
  LOCALTIME=	Canada/Mountain
--- 1,4 ----
! #	$OpenBSD: Makefile,v 1.227 2005/08/15 00:40:17 millert Exp $
  
  TZDIR=		/usr/share/zoneinfo
  LOCALTIME=	Canada/Mountain
***************
*** 19,25 ****
  	protocols rbootd.conf rc rc.conf rc.local rc.securelevel rc.shutdown \
  	remote rpc security services shells spamd.conf syslog.conf weekly \
  	etc.${MACHINE}/disktab dhclient.conf mailer.conf ntpd.conf \
! 	login.conf moduli pf.os sensorsd.conf ifstated.conf
  
  .if ${MACHINE} == "alpha" || ${MACHINE} == "amd64" || \
      ${MACHINE} == "cats" || ${MACHINE} == "hp300" || \
--- 19,25 ----
  	protocols rbootd.conf rc rc.conf rc.local rc.securelevel rc.shutdown \
  	remote rpc security services shells spamd.conf syslog.conf weekly \
  	etc.${MACHINE}/disktab dhclient.conf mailer.conf ntpd.conf \
! 	moduli pf.os sensorsd.conf ifstated.conf
  
  .if ${MACHINE} == "alpha" || ${MACHINE} == "amd64" || \
      ${MACHINE} == "cats" || ${MACHINE} == "hp300" || \
***************
*** 72,77 ****
--- 72,81 ----
  	    chown ${BINOWN} ${DESTDIR}/etc/fbtab && \
  	    chgrp ${BINGRP} ${DESTDIR}/etc/fbtab && \
  	    chmod 644 ${DESTDIR}/etc/fbtab
+ 	awk -f ${.CURDIR}/mklogin.conf `test -f etc.${MACHINE}/login.conf.overrides && echo etc.${MACHINE}/login.conf.overrides` < ${.CURDIR}/login.conf.in > \
+ 	    ${DESTDIR}/etc/login.conf && \
+ 	    chown ${BINOWN}:${BINGRP} ${DESTDIR}/etc/login.conf && \
+ 	    chmod 644 ${DESTDIR}/etc/login.conf 
  	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 664 ${BIN2} ${DESTDIR}/etc
  	${INSTALL} -c -o root -g wheel -m 600 hosts.equiv ${DESTDIR}/etc
  	${INSTALL} -c -o root -g wheel -m 600 crontab ${DESTDIR}/var/cron/tabs/root
***************
*** 376,382 ****
  DHSIZE=1024 1536 2048 3072 4096
  update-moduli:
  	( \
! 		echo '#    $$OpenBSD: Makefile,v 1.226 2005/05/26 23:06:06 mcbride Exp $$'; \
  		echo '# Time Type Tests Tries Size Generator Modulus'; \
  		( for i in ${DHSIZE}; do \
  			ssh-keygen -b $$i -G /dev/stdout; \
--- 380,386 ----
  DHSIZE=1024 1536 2048 3072 4096
  update-moduli:
  	( \
! 		echo '#    $$OpenBSD: Makefile,v 1.227 2005/08/15 00:40:17 millert Exp $$'; \
  		echo '# Time Type Tests Tries Size Generator Modulus'; \
  		( for i in ${DHSIZE}; do \
  			ssh-keygen -b $$i -G /dev/stdout; \