svn commit: r251000 - head

[Eitan Adler]

Author: eadler
Date: Sun May 26 14:54:06 2013
New Revision: 251000
URL: http://svnweb.freebsd.org/changeset/base/251000

Log:
  Remove backwards compat layer which was added in r71419 (in 2001).
  
  This change is not intended for MFC.
  
  Reviewed by:	peter

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Sun May 26 14:40:23 2013	(r250999)
+++ head/Makefile.inc1	Sun May 26 14:54:06 2013	(r251000)
@@ -892,16 +892,11 @@ NO_KERNELOBJ=		t
 KERNCONF=${KERNFAST}
 .endif
 .endif
-.if !defined(KERNCONF) && defined(KERNEL)
-KERNCONF=	${KERNEL}
-KERNWARN=
-.else
 .if ${TARGET_ARCH} == "powerpc64"
 KERNCONF?=	GENERIC64
 .else
 KERNCONF?=	GENERIC
 .endif
-.endif
 INSTKERNNAME?=	kernel
 
 KERNSRCDIR?=	${.CURDIR}/sys
@@ -930,12 +925,6 @@ buildkernel:
 	@echo "ERROR: Missing kernel configuration file(s) (${KERNCONF})."; \
 	false
 .endif
-.if defined(KERNWARN)
-	@echo "--------------------------------------------------------------"
-	@echo ">>> WARNING: KERNEL= setting should be changed to KERNCONF="
-	@echo "--------------------------------------------------------------"
-	@sleep 3
-.endif
 	@echo
 .for _kernel in ${BUILDKERNELS}
 	@echo "--------------------------------------------------------------"