From 0ab105eaf23a93684f16eed35b0c3b0e9e6b2217 Mon Sep 17 00:00:00 2001
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Sat, 8 Mar 2003 08:57:56 +0000
Subject: [PATCH] Don't copy headers from the source tree to the object tree
 without making sure the copies in the object tree are writable. When files in
 the source tree are not writable (as would be the case for a p4 tree) then a
 buildworld -DNOCLEAN will try to copy over the existing non-writable headers.
 This fails. Instead we cat the headers with redirection. This is just one of
 the possibilities.

---
 kerberos5/libexec/k5admind/Makefile  | 4 ++--
 kerberos5/libexec/k5passwdd/Makefile | 4 ++--
 kerberos5/libexec/kadmind/Makefile   | 4 ++--
 kerberos5/libexec/kpasswdd/Makefile  | 4 ++--
 kerberos5/usr.bin/k5admin/Makefile   | 4 ++--
 kerberos5/usr.bin/kadmin/Makefile    | 4 ++--
 kerberos5/usr.sbin/ktutil/Makefile   | 4 ++--
 7 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/kerberos5/libexec/k5admind/Makefile b/kerberos5/libexec/k5admind/Makefile
index f807f120c0c8..70beef63d84b 100644
--- a/kerberos5/libexec/k5admind/Makefile
+++ b/kerberos5/libexec/k5admind/Makefile
@@ -36,10 +36,10 @@ NOMAN=		yes
 .PATH:	${KRB5DIR}/kadmin
 
 kadm5/private.h:	kadm5
-	cp ${KRB5DIR}/lib/kadm5/private.h ${.TARGET}
+	cat ${KRB5DIR}/lib/kadm5/private.h > ${.TARGET}
 
 kadm5/admin.h:	kadm5
-	cp ${KRB5DIR}/lib/kadm5/admin.h ${.TARGET}
+	cat ${KRB5DIR}/lib/kadm5/admin.h > ${.TARGET}
 
 kadm5/kadm5_err.h: kadm5 kadm5_err.h
 	cd ${.OBJDIR}/kadm5 && ln -sf ../kadm5_err.h
diff --git a/kerberos5/libexec/k5passwdd/Makefile b/kerberos5/libexec/k5passwdd/Makefile
index ce0bdd38fa43..3b53959deebd 100644
--- a/kerberos5/libexec/k5passwdd/Makefile
+++ b/kerberos5/libexec/k5passwdd/Makefile
@@ -31,10 +31,10 @@ MAN=		kpasswdd.8
 .PATH:	${KRB5DIR}/kpasswd
 
 kadm5/admin.h:	kadm5
-	cp ${KRB5DIR}/lib/kadm5/admin.h ${.TARGET}
+	cat ${KRB5DIR}/lib/kadm5/admin.h > ${.TARGET}
 
 kadm5/private.h: kadm5
-	cp ${KRB5DIR}/lib/kadm5/private.h ${.TARGET}
+	cat ${KRB5DIR}/lib/kadm5/private.h > ${.TARGET}
 
 kadm5:
 	mkdir ${.TARGET}
diff --git a/kerberos5/libexec/kadmind/Makefile b/kerberos5/libexec/kadmind/Makefile
index f807f120c0c8..70beef63d84b 100644
--- a/kerberos5/libexec/kadmind/Makefile
+++ b/kerberos5/libexec/kadmind/Makefile
@@ -36,10 +36,10 @@ NOMAN=		yes
 .PATH:	${KRB5DIR}/kadmin
 
 kadm5/private.h:	kadm5
-	cp ${KRB5DIR}/lib/kadm5/private.h ${.TARGET}
+	cat ${KRB5DIR}/lib/kadm5/private.h > ${.TARGET}
 
 kadm5/admin.h:	kadm5
-	cp ${KRB5DIR}/lib/kadm5/admin.h ${.TARGET}
+	cat ${KRB5DIR}/lib/kadm5/admin.h > ${.TARGET}
 
 kadm5/kadm5_err.h: kadm5 kadm5_err.h
 	cd ${.OBJDIR}/kadm5 && ln -sf ../kadm5_err.h
diff --git a/kerberos5/libexec/kpasswdd/Makefile b/kerberos5/libexec/kpasswdd/Makefile
index ce0bdd38fa43..3b53959deebd 100644
--- a/kerberos5/libexec/kpasswdd/Makefile
+++ b/kerberos5/libexec/kpasswdd/Makefile
@@ -31,10 +31,10 @@ MAN=		kpasswdd.8
 .PATH:	${KRB5DIR}/kpasswd
 
 kadm5/admin.h:	kadm5
-	cp ${KRB5DIR}/lib/kadm5/admin.h ${.TARGET}
+	cat ${KRB5DIR}/lib/kadm5/admin.h > ${.TARGET}
 
 kadm5/private.h: kadm5
-	cp ${KRB5DIR}/lib/kadm5/private.h ${.TARGET}
+	cat ${KRB5DIR}/lib/kadm5/private.h > ${.TARGET}
 
 kadm5:
 	mkdir ${.TARGET}
diff --git a/kerberos5/usr.bin/k5admin/Makefile b/kerberos5/usr.bin/k5admin/Makefile
index 8ba76add34cb..04ae169e8343 100644
--- a/kerberos5/usr.bin/k5admin/Makefile
+++ b/kerberos5/usr.bin/k5admin/Makefile
@@ -56,10 +56,10 @@ MAN=		k5admin.8
 .PATH:	${KRB5DIR}/kadmin
 
 kadm5/private.h:	kadm5
-	cp ${KRB5DIR}/lib/kadm5/private.h ${.TARGET}
+	cat ${KRB5DIR}/lib/kadm5/private.h > ${.TARGET}
 
 kadm5/admin.h:	kadm5
-	cp ${KRB5DIR}/lib/kadm5/admin.h ${.TARGET}
+	cat ${KRB5DIR}/lib/kadm5/admin.h > ${.TARGET}
 
 kadm5/kadm5_err.h: kadm5 kadm5_err.h
 	cd ${.OBJDIR}/kadm5 && ln -sf ../kadm5_err.h
diff --git a/kerberos5/usr.bin/kadmin/Makefile b/kerberos5/usr.bin/kadmin/Makefile
index 8ba76add34cb..04ae169e8343 100644
--- a/kerberos5/usr.bin/kadmin/Makefile
+++ b/kerberos5/usr.bin/kadmin/Makefile
@@ -56,10 +56,10 @@ MAN=		k5admin.8
 .PATH:	${KRB5DIR}/kadmin
 
 kadm5/private.h:	kadm5
-	cp ${KRB5DIR}/lib/kadm5/private.h ${.TARGET}
+	cat ${KRB5DIR}/lib/kadm5/private.h > ${.TARGET}
 
 kadm5/admin.h:	kadm5
-	cp ${KRB5DIR}/lib/kadm5/admin.h ${.TARGET}
+	cat ${KRB5DIR}/lib/kadm5/admin.h > ${.TARGET}
 
 kadm5/kadm5_err.h: kadm5 kadm5_err.h
 	cd ${.OBJDIR}/kadm5 && ln -sf ../kadm5_err.h
diff --git a/kerberos5/usr.sbin/ktutil/Makefile b/kerberos5/usr.sbin/ktutil/Makefile
index 5c7455e7f503..a07663e3233d 100644
--- a/kerberos5/usr.sbin/ktutil/Makefile
+++ b/kerberos5/usr.sbin/ktutil/Makefile
@@ -46,10 +46,10 @@ MAN=		ktutil.8
 .PATH:	${KRB5DIR}/admin
 
 kadm5/private.h:	kadm5
-	cp ${KRB5DIR}/lib/kadm5/private.h ${.TARGET}
+	cat ${KRB5DIR}/lib/kadm5/private.h > ${.TARGET}
 
 kadm5/admin.h:	kadm5
-	cp ${KRB5DIR}/lib/kadm5/admin.h ${.TARGET}
+	cat ${KRB5DIR}/lib/kadm5/admin.h > ${.TARGET}
 
 kadm5/kadm5_err.h: kadm5 kadm5_err.h
 	cd ${.OBJDIR}/kadm5 && ln -sf ../kadm5_err.h