diff options
| author |   hin <hin@openbsd.org> | 2001-06-05 10:10:55 +0000 |
|---|---|---|
| committer | hin <hin@openbsd.org> | 2001-06-05 10:10:55 +0000 |
| commit | 75838eed6c65baf157d78115b141b05a27eb841f (patch) | |
| tree | 2ae0952fdef1c49ee1443ec31d6f17d402c5ae45 | |
| parent | Don't use log_error() in vain. (diff) | |
| download | wireguard-openbsd-75838eed6c65baf157d78115b141b05a27eb841f.tar.xz wireguard-openbsd-75838eed6c65baf157d78115b141b05a27eb841f.zip | |
Don't spawn unecessary subshell in the "make build" target, a.k.a hin-is-lazy
target.
Fix sudo build while i'm here.
| -rw-r--r-- | kerberosIV/Makefile | 6 | ||||
| -rw-r--r-- | kerberosIV/lib/kafs/Makefile | 10 | ||||
| -rw-r--r-- | kerberosIV/src/appl/bsd/login_fbtab.c | 9 |
3 files changed, 16 insertions, 9 deletions
diff --git a/kerberosIV/Makefile b/kerberosIV/Makefile index 815fd5ec29b..3992e86ddb7 100644 --- a/kerberosIV/Makefile +++ b/kerberosIV/Makefile @@ -1,12 +1,12 @@ -# $OpenBSD: Makefile,v 1.31 2000/09/04 18:02:42 hin Exp $ +# $OpenBSD: Makefile,v 1.32 2001/06/05 10:10:55 hin Exp $ SUBDIR = lib usr.bin usr.sbin libexec doc build: ${MAKE} includes ${MAKE} depend - ( cd ${.CURDIR}/lib && ${MAKE} && ${MAKE} install ) + cd ${.CURDIR}/lib && ${MAKE} && ${SUDO} ${MAKE} install ${MAKE} - ${MAKE} install + ${SUDO} ${MAKE} install .include <bsd.subdir.mk> diff --git a/kerberosIV/lib/kafs/Makefile b/kerberosIV/lib/kafs/Makefile index 07c550cbbbc..c3c58104dc2 100644 --- a/kerberosIV/lib/kafs/Makefile +++ b/kerberosIV/lib/kafs/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2001/01/09 02:41:17 angelos Exp $ +# $OpenBSD: Makefile,v 1.7 2001/06/05 10:10:58 hin Exp $ LIB = kafs @@ -13,11 +13,17 @@ CFLAGS += -I${KRBSRC}/lib/kafs SRCS= afssys_openbsd.c \ afskrb.c \ - $(afskrb5_c) \ common.c \ kafs_locl.h \ afssysdefs.h +.include <bsd.own.mk> # for KERBEROS5 + +.if (${KERBEROS5:L} == "yes") +SRCS+= afskrb5.c +CFLAGS+=-DKRB5 -I${DESTDIR}/usr/include/kerberosV +.endif + MAN= kafs.3 MLINKS= kafs.3 k_hasafs.3 \ kafs.3 k_pioctl.3 \ diff --git a/kerberosIV/src/appl/bsd/login_fbtab.c b/kerberosIV/src/appl/bsd/login_fbtab.c index 46ee2e9f2b7..ede7268cc36 100644 --- a/kerberosIV/src/appl/bsd/login_fbtab.c +++ b/kerberosIV/src/appl/bsd/login_fbtab.c @@ -1,13 +1,14 @@ /************************************************************************ -* Copyright 1995 by Wietse Venema. All rights reserved. +* Copyright 1995 by Wietse Venema. All rights reserved. Some individual +* files may be covered by other copyrights. * * This material was originally written and compiled by Wietse Venema at * Eindhoven University of Technology, The Netherlands, in 1990, 1991, * 1992, 1993, 1994 and 1995. * -* Redistribution and use in source and binary forms are permitted -* provided that this entire copyright notice is duplicated in all such -* copies. +* Redistribution and use in source and binary forms, with or without +* modification, are permitted provided that this entire copyright notice +* is duplicated in all such copies. * * This software is provided "as is" and without any expressed or implied * warranties, including, without limitation, the implied warranties of |