summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--kerberosIV/Makefile.inc12
-rw-r--r--kerberosIV/lib/Makefile4
-rw-r--r--kerberosIV/lib/krb/Makefile4
3 files changed, 12 insertions, 8 deletions
diff --git a/kerberosIV/Makefile.inc b/kerberosIV/Makefile.inc
index 45562edbd56..ad9f23a0c6c 100644
--- a/kerberosIV/Makefile.inc
+++ b/kerberosIV/Makefile.inc
@@ -1,15 +1,19 @@
-# $OpenBSD: Makefile.inc,v 1.14 2001/07/08 17:56:52 brad Exp $
+# $OpenBSD: Makefile.inc,v 1.15 2002/06/09 19:05:39 hin Exp $
KRBDIR = ${.CURDIR}/${KRBDEPTH}
KRBSRC = ${.CURDIR}/${KRBDEPTH}/src
+KRB5DIR = ${KRBDIR}/../kerberosV
+KRB5SRC = ${KRB5DIR}/src
+
CFLAGS += -DHAVE_CONFIG_H -DBINDIR=\"/usr/bin\" -DSBINDIR=\"/usr/sbin\" \
-I${DESTDIR}/usr/include/kerberosIV \
- -I${KRBSRC}/include -I${KRBSRC}/lib/roken \
- -I${KRBDIR}/lib/roken -I${KRBSRC}/lib/sl
+ -I${KRBSRC}/include -I${KRBSRC}/lib/sl \
+ -I${KRB5SRC}/lib/roken -I${KRB5DIR}/include
+
CFLAGS+=-Wall
-LIBROKEN= -L${KRBDEPTH}/lib/roken -lroken
+LIBROKEN= -L${KRBDEPTH}/../kerberosV/lib/roken -lroken
LIBSL = -L${KRBDEPTH}/lib/sl -lsl
.PATH: ${KRBSRC}/man
diff --git a/kerberosIV/lib/Makefile b/kerberosIV/lib/Makefile
index 31579b6ba0b..26133dbe32a 100644
--- a/kerberosIV/lib/Makefile
+++ b/kerberosIV/lib/Makefile
@@ -1,7 +1,7 @@
-# $OpenBSD: Makefile,v 1.1 2000/02/25 16:35:24 hin Exp $
+# $OpenBSD: Makefile,v 1.2 2002/06/09 19:05:40 hin Exp $
.if !make(install)
-SUBDIR = roken sl
+SUBDIR = sl
.endif
SUBDIR += krb kadm kafs kdb acl
diff --git a/kerberosIV/lib/krb/Makefile b/kerberosIV/lib/krb/Makefile
index 249e75dde9d..509a5e431dc 100644
--- a/kerberosIV/lib/krb/Makefile
+++ b/kerberosIV/lib/krb/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2002/05/11 00:20:18 espie Exp $
+# $OpenBSD: Makefile,v 1.9 2002/06/09 19:05:40 hin Exp $
LIB = krb
@@ -7,7 +7,7 @@ KRBDEPTH=../..
INCLUDE_FILES = ${KRBSRC}/lib/krb/{krb.h,krb-protos.h,prot.h} krb_err.h
-.PATH: ${KRBSRC}/lib/krb ${KRBSRC}/lib/roken ${KRBSRC}/lib/des
+.PATH: ${KRBSRC}/lib/krb ${KRB5SRC}/lib/roken ${KRBSRC}/lib/des
CFLAGS += -I${KRBSRC}/lib/des -I${KRBSRC}/lib/krb -I${BSDSRCDIR}/lib/libcom_err