===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/etc/Makefile,v
retrieving revision 1.206
retrieving revision 1.207
diff -c -r1.206 -r1.207
*** src/etc/Makefile	2004/05/04 23:37:04	1.206
--- src/etc/Makefile	2004/05/18 16:45:46	1.207
***************
*** 1,4 ****
! #	$OpenBSD: Makefile,v 1.206 2004/05/04 23:37:04 deraadt Exp $
  
  TZDIR=		/usr/share/zoneinfo
  LOCALTIME=	Canada/Mountain
--- 1,4 ----
! #	$OpenBSD: Makefile,v 1.207 2004/05/18 16:45:46 drahn Exp $
  
  TZDIR=		/usr/share/zoneinfo
  LOCALTIME=	Canada/Mountain
***************
*** 58,64 ****
  .else
  distribution-etc-root-var: distrib-dirs
  	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 ${BIN1} ${DESTDIR}/etc
! 	cat etc.${MACHINE}/ttys ttys.pty > ${DESTDIR}/etc/ttys && \
  	    chown ${BINOWN} ${DESTDIR}/etc/ttys && \
  	    chgrp ${BINGRP} ${DESTDIR}/etc/ttys && \
  	    chmod 644 ${DESTDIR}/etc/ttys
--- 58,64 ----
  .else
  distribution-etc-root-var: distrib-dirs
  	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 ${BIN1} ${DESTDIR}/etc
! 	ksh ttys.pty | cat etc.${MACHINE}/ttys - > ${DESTDIR}/etc/ttys && \
  	    chown ${BINOWN} ${DESTDIR}/etc/ttys && \
  	    chgrp ${BINGRP} ${DESTDIR}/etc/ttys && \
  	    chmod 644 ${DESTDIR}/etc/ttys
***************
*** 373,379 ****
  DHSIZE=1024 1536 2048 3072 4096
  update-moduli:
  	( \
! 		echo '#    $$OpenBSD: Makefile,v 1.206 2004/05/04 23:37:04 deraadt Exp $$'; \
  		echo '# Time Type Tests Tries Size Generator Modulus'; \
  		( for i in ${DHSIZE}; do \
  			ssh-keygen -b $$i -G /dev/stdout; \
--- 373,379 ----
  DHSIZE=1024 1536 2048 3072 4096
  update-moduli:
  	( \
! 		echo '#    $$OpenBSD: Makefile,v 1.207 2004/05/18 16:45:46 drahn Exp $$'; \
  		echo '# Time Type Tests Tries Size Generator Modulus'; \
  		( for i in ${DHSIZE}; do \
  			ssh-keygen -b $$i -G /dev/stdout; \