diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Makefile | 10 | ||||
| -rw-r--r-- | lib/libkadm5srv/Makefile | 5 | ||||
| -rw-r--r-- | lib/libkrb5/Makefile | 17 |
3 files changed, 27 insertions, 5 deletions
diff --git a/lib/Makefile b/lib/Makefile index 95775100fe7..2f982165b1e 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -1,9 +1,15 @@ -# $OpenBSD: Makefile,v 1.49 2003/05/14 01:46:51 hin Exp $ +# $OpenBSD: Makefile,v 1.50 2003/07/14 16:14:42 mho Exp $ # $NetBSD: Makefile,v 1.20.4.1 1996/06/14 17:22:38 cgd Exp $ -SUBDIR= csu libarch libc libcom_err libcompat libcurses libcurses++ \ +SUBDIR= csu libarch libc libcompat libcurses libcurses++ \ libdes libedit libevent libform libkeynote libkvm libl libm libmenu \ libocurses libossaudio libpanel libpcap libpthread libresolv librpcsvc \ libskey libsectok libssl libusbhid libutil libwrap liby libz +.include <bsd.own.mk> + +.if (${KERBEROS5:L} == "yes") +SUBDIR+=libgssapi libkadm5srv libkadm5clnt libkrb5 +.endif + .include <bsd.subdir.mk> diff --git a/lib/libkadm5srv/Makefile b/lib/libkadm5srv/Makefile index 25f9ff1c04a..e3371fb01a7 100644 --- a/lib/libkadm5srv/Makefile +++ b/lib/libkadm5srv/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2003/05/17 05:20:18 mho Exp $ +# $OpenBSD: Makefile,v 1.3 2003/07/14 16:14:43 mho Exp $ KRB5DIR = ${.CURDIR}/../../kerberosV .include <${.CURDIR}/../libkrb5/Makefile.common.inc> @@ -26,7 +26,8 @@ includes: kadm5_err.h cmp -s $$i ${DESTDIR}/usr/include/kerberosV/kadm5/$$i || \ ${INSTALL} ${INSTALL_COPY} -m 444 \ -o ${BINOWN} -g $(BINGRP) $$i \ - ${DESTDIR}/usr/include/kerberosV/kadm5; done + ${DESTDIR}/usr/include/kerberosV/kadm5; done; \ + echo SRCS= acl.c \ admin.h \ diff --git a/lib/libkrb5/Makefile b/lib/libkrb5/Makefile index a92e23e6767..f4f878dffae 100644 --- a/lib/libkrb5/Makefile +++ b/lib/libkrb5/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 2003/06/03 09:18:00 hin Exp $ +# $OpenBSD: Makefile,v 1.10 2003/07/14 16:14:43 mho Exp $ KRB5DIR= ${.CURDIR}/../../kerberosV GENDIR= ${.CURDIR}/generated @@ -10,6 +10,7 @@ LIB = krb5 .PATH: ${GENDIR} .include "Makefile.asn1.inc" +.include "Makefile.com_err.inc" .include "Makefile.hdb.inc" .include "Makefile.kafs.inc" .include "Makefile.roken.inc" @@ -17,6 +18,12 @@ LIB = krb5 .include "Makefile.com_err.inc" includes: + @echo "Removing old Kerberos include files (transitionary)" + @/bin/rm -rf ${DESTDIR}/usr/include/kerberosV \ + ${DESTDIR}/usr/include/kerberosIV \ + ${DESTDIR}/usr/include/com_err.h + @echo "Symlinking /usr/include/com_err.h (transitionary)" + @/bin/ln -s /usr/include/kerberosV/com_err.h ${DESTDIR}/usr/include/ @test -d ${DESTDIR}/usr/include/kerberosV || \ mkdir ${DESTDIR}/usr/include/kerberosV @echo -n ${DIR_KRB5INC}:; \ @@ -43,6 +50,14 @@ includes: -o ${BINOWN} -g $(BINGRP) $$i \ ${DESTDIR}/usr/include/kerberosV; done; \ echo + @echo -n ${DIR_COM_ERR}:; \ + cd ${DIR_COM_ERR}; for i in ${HDR_COM_ERR}; do \ + echo -n " $$i"; \ + cmp -s $$i ${DESTDIR}/usr/include/kerberosV/$$i || \ + ${INSTALL} ${INSTALL_COPY} -m 444 \ + -o ${BINOWN} -g $(BINGRP) $$i \ + ${DESTDIR}/usr/include/kerberosV; done; \ + echo @echo -n ${DIR_HDB}:; \ cd ${DIR_HDB}; for i in ${HDR_HDB}; do \ echo -n " $$i"; \ |