Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/netbsd-1-5]: src/lib/libkadm5clnt Pull up rev. 1.3:



details:   https://anonhg.NetBSD.org/src/rev/c7ffedc062e4
branches:  netbsd-1-5
changeset: 488194:c7ffedc062e4
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Wed Jun 21 06:36:24 2000 +0000

description:
Pull up rev. 1.3:
Detect if MIT Kerberos V headers are present on the system (by looking
in ${DESTDIR}/usr/include/kadm5/kadm_err.h) and if so, tell the operator
to remove the contents of that directory in an error message and abort.

diffstat:

 lib/libkadm5clnt/Makefile |  12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diffs (24 lines):

diff -r b6de0278c898 -r c7ffedc062e4 lib/libkadm5clnt/Makefile
--- a/lib/libkadm5clnt/Makefile Wed Jun 21 05:11:13 2000 +0000
+++ b/lib/libkadm5clnt/Makefile Wed Jun 21 06:36:24 2000 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2000/06/16 22:46:47 thorpej Exp $
+# $NetBSD: Makefile,v 1.2.2.1 2000/06/21 06:36:24 thorpej Exp $
 DIST=          ${.CURDIR}/../../crypto/dist
 .PATH: ${DIST}/heimdal/lib/kadm5
 
@@ -62,4 +62,14 @@
 
 CLEANFILES = kadm5_err.h kadm5_err.c
 
+# Prevent collision with old MIT Kerberos includes -- require manual
+# intervention of the operator.
+.BEGIN:
+.ifmake includes
+       @if [ -f ${DESTDIR}${INCSDIR}/kadm_err.h ]; then \
+               echo "Error: you must first remove the MIT headers from ${DESTDIR}${INCSDIR}" >&2; \
+               false; \
+       fi
+.endif
+
 .include <bsd.lib.mk>



Home | Main Index | Thread Index | Old Index