From a1c8575cf9232fe66c9cf28ad65afb3953dce41a Mon Sep 17 00:00:00 2001
From: tb <>
Date: Tue, 8 Nov 2016 19:56:56 +0000
Subject: [PATCH] Set owners and permissions only after all headers are
 installed. Add the -P flag to chown to change the symlinks themselves instead
 of their targets. Also change permissions of all symlinks, so they don't
 depend on the umask during make build.

ok millert
---
 src/include/Makefile | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/include/Makefile b/src/include/Makefile
index e0feebcb..7c5f3c6b 100644
--- a/src/include/Makefile
+++ b/src/include/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.214 2016/10/16 19:28:44 tb Exp $
+#	$OpenBSD: Makefile,v 1.215 2016/11/08 19:56:56 tb Exp $
 #	$NetBSD: Makefile,v 1.59 1996/05/15 21:36:43 jtc Exp $
 
 #	@(#)Makefile	5.45.1.1 (Berkeley) 5/6/91
@@ -92,15 +92,15 @@ includes:
 		rm -f ${DESTDIR}/usr/include/$$i && \
 		ln -s machine/$$i ${DESTDIR}/usr/include/$$i; \
 	done
-	chown -R ${BINOWN}:${BINGRP} ${DESTDIR}/usr/include
-	find ${DESTDIR}/usr/include -type f -print0 | \
-		xargs -0r chmod a=r
-	find ${DESTDIR}/usr/include -type d -print0 | \
-		xargs -0r chmod u=rwx,go=rx
 	@for i in ${RDIRS}; do \
 		echo installing in ${.CURDIR}/$$i; \
 		cd ${.CURDIR}/$$i && ${RUN_MAKE}; \
 	done
+	chown -RP ${BINOWN}:${BINGRP} ${DESTDIR}/usr/include
+	find ${DESTDIR}/usr/include -type f -print0 | \
+		xargs -0r chmod a=r
+	find ${DESTDIR}/usr/include \( -type d -o -type l \) -print0 | \
+		xargs -0r chmod -h u=rwx,go=rx
 
 copies:
 	@echo copies: ${LDIRS}