svn commit: r301088 - head/sys/conf

[Bryan Drewery]

Author: bdrewery
Date: Tue May 31 23:40:21 2016
New Revision: 301088
URL: https://svnweb.freebsd.org/changeset/base/301088

Log:
  WITH_META_MDE: Fix machine/include and x86/include issues.
  
  - Fixes 'ln: File exists' errors.
  - Fixes creating include directories in the source directory as well.
  
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  head/sys/conf/kern.post.mk
  head/sys/conf/kmod.mk

Modified: head/sys/conf/kern.post.mk
==============================================================================
--- head/sys/conf/kern.post.mk	Tue May 31 23:26:45 2016	(r301087)
+++ head/sys/conf/kern.post.mk	Tue May 31 23:40:21 2016	(r301088)
@@ -285,7 +285,7 @@ ${_ILINKS}:
 		path=${S}/${.TARGET}/include ;; \
 	esac ; \
 	${ECHO} ${.TARGET} "->" $$path ; \
-	ln -s $$path ${.TARGET}
+	ln -fhs $$path ${.TARGET}
 
 # .depend needs include links so we remove them only together.
 kernel-cleandepend: .PHONY

Modified: head/sys/conf/kmod.mk
==============================================================================
--- head/sys/conf/kmod.mk	Tue May 31 23:26:45 2016	(r301087)
+++ head/sys/conf/kmod.mk	Tue May 31 23:40:21 2016	(r301088)
@@ -287,7 +287,7 @@ ${_ILINKS}:
 	esac ; \
 	path=`(cd $$path && /bin/pwd)` ; \
 	${ECHO} ${.TARGET:T} "->" $$path ; \
-	ln -sf $$path ${.TARGET:T}
+	ln -fhs $$path ${.TARGET:T}
 
 CLEANFILES+= ${PROG} ${KMOD}.kld ${OBJS}