Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/etc/Makefile,v
rcsdiff: /ftp/cvs/cvsroot/src/etc/Makefile,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.350.2.2
retrieving revision 1.351
diff -u -p -r1.350.2.2 -r1.351
--- src/etc/Makefile	2008/06/04 02:03:21	1.350.2.2
+++ src/etc/Makefile	2008/04/30 16:48:53	1.351
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.350.2.2 2008/06/04 02:03:21 yamt Exp $
+#	$NetBSD: Makefile,v 1.351 2008/04/30 16:48:53 ad Exp $
 #	from: @(#)Makefile	8.7 (Berkeley) 5/25/95
 
 # Environment variables without default values:
@@ -183,7 +183,7 @@ RELEASEVARS=	BSDOBJDIR BSDSRCDIR BUILDID
 		MKDEBUG MKDEBUGLIB MKDOC MKDYNAMICROOT \
 		MKGCC MKGCCCMDS MKGDB \
 		MKHESIOD MKHOSTOBJ MKHTML MKIEEEFP MKINET6 MKINFO MKIPFILTER \
-		MKKERBEROS MKLDAP MKLINKLIB MKLINT \
+		MKKERBEROS MKLINKLIB MKLINT \
 		MKMAN MKMANZ MKNLS MKOBJ MKOBJDIRS \
 		MKPAM MKPF MKPIC MKPICINSTALL MKPICLIB MKPOSTFIX MKPROFILE \
 		MKSHARE MKSKEY MKSOFTFLOAT MKSTATICLIB \
@@ -192,7 +192,7 @@ RELEASEVARS=	BSDOBJDIR BSDSRCDIR BUILDID
 		NOCLEANDIR NODISTRIBDIRS NOINCLUDES \
 		OBJMACHINE \
 		RELEASEDIR RELEASEMACHINEDIR TOOLCHAIN_MISSING TOOLDIR \
-		USE_HESIOD USE_INET6 USE_JEMALLOC USE_KERBEROS USE_LDAP \
+		USE_HESIOD USE_INET6 USE_JEMALLOC USE_KERBEROS \
 		USE_PAM USE_SKEY USE_YP \
 		USETOOLS USR_OBJMACHINE \
 		X11SRCDIR
@@ -336,7 +336,6 @@ install-etc-files: .PHONY .MAKE check_DE
 .for subdir in . atf defaults bluetooth iscsi mtree namedb pam.d powerd rc.d root skel ssh
 	${MAKEDIRTARGET} ${subdir} configinstall
 .endfor
-	${MAKEDIRTARGET} ${NETBSDSRCDIR}/sbin/dhcpcd configinstall
 	${MAKEDIRTARGET} ${NETBSDSRCDIR}/usr.bin/mail configinstall
 .if (${MKPF} != "no")
 	${MAKEDIRTARGET} ${NETBSDSRCDIR}/usr.sbin/pf configinstall
@@ -610,7 +609,6 @@ releasekern-${configfile}: .PHONY build_
 				[ ! -f $${ks} ] && continue; \
 				knl_gz="${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/kernel/$${ks}-${configfile:C/.*\///}.gz"; \
 				[ $${knl_gz} -nt $${ks} ] && continue; \
-				rm -f $${knl_gz}; \
 				echo "gzip -c -9 < $${kerndir}/$${ks} > $${knl_gz}"; \
 				gzip -c -9 < $${ks} > $${knl_gz}; \
 			done; \