Make kerberos work with OBJMACHINE style objdirs

5 files changed, 37 insertions, 32 deletions

diff --git a/kerberosIV/Makefile.inc b/kerberosIV/Makefile.inc
index 4a570157baf..e685ddb0781 100644
--- a/kerberosIV/Makefile.inc
+++ b/kerberosIV/Makefile.inc
@@ -1,23 +1,28 @@
-#	from @(#)Makefile.inc	8.1 (Berkeley) 6/1/93
-#	$Id: Makefile.inc,v 1.1.1.1 1995/12/14 06:52:32 tholo Exp $
+#	$OpenBSD: Makefile.inc,v 1.2 1996/06/02 14:41:57 niklas Exp $
 
 CFLAGS+=-I${.CURDIR}/../include
 BINDIR?=/usr/sbin
 
-.if exists(${.CURDIR}/../mk_cmds/obj)
-MK_CMDS=${.CURDIR}/../mk_cmds/obj/mk_cmds
+.if defined(OBJMACHINE)
+__objdir=	obj.${MACHINE}
+.else
+__objdir=	obj
+.endif
+
+.if exists(${.CURDIR}/../mk_cmds/${__objdir})
+MK_CMDS=${.CURDIR}/../mk_cmds/${__objdir}/mk_cmds
 .else
 MK_CMDS=${.CURDIR}/../mk_cmds/mk_cmds
 .endif
 
-.if exists(${.CURDIR}/../compile_et/obj)
-COMPILE_ET=${.CURDIR}/../compile_et/obj/compile_et
+.if exists(${.CURDIR}/../compile_et/${__objdir})
+COMPILE_ET=${.CURDIR}/../compile_et/${__objdir}/compile_et
 .else
 COMPILE_ET=${.CURDIR}/../compile_et/compile_et
 .endif
 
-.if exists(${.CURDIR}/../com_err/obj)
-COM_ERR=-L${.CURDIR}/../com_err/obj -lcom_err_pic
+.if exists(${.CURDIR}/../com_err/${__objdir})
+COM_ERR=-L${.CURDIR}/../com_err/${__objdir} -lcom_err_pic
 .else
 COM_ERR=-L${.CURDIR}/../com_err -lcom_err_pic
 .endif
diff --git a/kerberosIV/kadm/Makefile b/kerberosIV/kadm/Makefile
index 9a0477155e0..4c3c98d2b32 100644
--- a/kerberosIV/kadm/Makefile
+++ b/kerberosIV/kadm/Makefile
@@ -1,10 +1,10 @@
-#	$Id: Makefile,v 1.2 1996/06/02 07:21:32 tholo Exp $
+#	$OpenBSD: Makefile,v 1.3 1996/06/02 14:41:59 niklas Exp $
 
 LIB=	kadm
 SRCS=	kadm_err.c kadm_cli_wrap.c kadm_stream.c kadm_supp.c
 CFLAGS+=-I. -I${.CURDIR}
-.if exists(${.CURDIR}/../krb/obj)
-CFLAGS+=-I${.CURDIR}/../krb/obj
+.if exists(${.CURDIR}/../krb/${__objdir})
+CFLAGS+=-I${.CURDIR}/../krb/${__objdir}
 .else
 CFLAGS+=-I${.CURDIR}/../krb
 .endif
diff --git a/kerberosIV/kadmin/Makefile b/kerberosIV/kadmin/Makefile
index e24b6a28507..0c29071384c 100644
--- a/kerberosIV/kadmin/Makefile
+++ b/kerberosIV/kadmin/Makefile
@@ -1,20 +1,20 @@
-#	$Id: Makefile,v 1.1.1.1 1995/12/14 06:52:48 tholo Exp $
+#	$Id: Makefile,v 1.2 1996/06/02 14:42:01 niklas Exp $
 
 PROG=	kadmin
 SRCS=	kadmin.c kadmin_cmds.c maketime.c
 .PATH:	${.CURDIR}/../kdb_edit
-.if exists(${.CURDIR}/../kadm/obj)
-CFLAGS+=-I${.CURDIR}/../kadm/obj
+.if exists(${.CURDIR}/../kadm/${__objdir})
+CFLAGS+=-I${.CURDIR}/../kadm/${__objdir}
 .else
 CFLAGS+=-I${.CURDIR}/../kadm
 .endif
-.if exists(${.CURDIR}/../krb/obj)
-CFLAGS+=-I${.CURDIR}/../krb/obj
+.if exists(${.CURDIR}/../krb/${__objdir})
+CFLAGS+=-I${.CURDIR}/../krb/${__objdir}
 .else
 CFLAGS+=-I${.CURDIR}/../krb
 .endif
-.if exists(${.CURDIR}/../ss/obj)
-CFLAGS+=-I${.CURDIR}/../ss/obj
+.if exists(${.CURDIR}/../ss/${__objdir})
+CFLAGS+=-I${.CURDIR}/../ss/${__objdir}
 .else
 CFLAGS+=-I${.CURDIR}/../ss
 .endif
diff --git a/kerberosIV/kadmind/Makefile b/kerberosIV/kadmind/Makefile
index 0d008eef87c..e7d9bf30fad 100644
--- a/kerberosIV/kadmind/Makefile
+++ b/kerberosIV/kadmind/Makefile
@@ -1,19 +1,19 @@
-#	$Id: Makefile,v 1.1.1.1 1995/12/14 06:52:48 tholo Exp $
+#	$OpenBSD: Makefile,v 1.2 1996/06/02 14:42:02 niklas Exp $
 
 PROG=   kadmind
 SRCS=   admin_server.c kadm_funcs.c kadm_ser_wrap.c kadm_server.c
-.if exists(${.CURDIR}/../kadm/obj)
-CFLAGS+=-I${.CURDIR}/../kadm/obj
+.if exists(${.CURDIR}/../kadm/${__objdir})
+CFLAGS+=-I${.CURDIR}/../kadm/${__objdir}
 .else
 CFLAGS+=-I${.CURDIR}/../kadm
 .endif
-.if exists(${.CURDIR}/../krb/obj)
-CFLAGS+=-I${.CURDIR}/../krb/obj
+.if exists(${.CURDIR}/../krb/${__objdir})
+CFLAGS+=-I${.CURDIR}/../krb/${__objdir}
 .else
 CFLAGS+=-I${.CURDIR}/../krb
 .endif
-.if exists(${.CURDIR}/../ss/obj)
-CFLAGS+=-I${.CURDIR}/../ss/obj
+.if exists(${.CURDIR}/../ss/${__objdir})
+CFLAGS+=-I${.CURDIR}/../ss/${__objdir}
 .else
 CFLAGS+=-I${.CURDIR}/../ss
 .endif
diff --git a/kerberosIV/ksrvutil/Makefile b/kerberosIV/ksrvutil/Makefile
index 4d3510203fe..121531cfc1b 100644
--- a/kerberosIV/ksrvutil/Makefile
+++ b/kerberosIV/ksrvutil/Makefile
@@ -1,18 +1,18 @@
-#	$Id: Makefile,v 1.1.1.1 1995/12/14 06:52:53 tholo Exp $
+#	$OpenBSD: Makefile,v 1.2 1996/06/02 14:42:03 niklas Exp $
 
 PROG=	ksrvutil
-.if exists(${.CURDIR}/../kadm/obj)
-CFLAGS+=-I${.CURDIR}/../kadm/obj
+.if exists(${.CURDIR}/../kadm/${__objdir})
+CFLAGS+=-I${.CURDIR}/../kadm/${__objdir}
 .else
 CFLAGS+=-I${.CURDIR}/../kadm
 .endif
-.if exists(${.CURDIR}/../krb/obj)
-CFLAGS+=-I${.CURDIR}/../krb/obj
+.if exists(${.CURDIR}/../krb/${__objdir})
+CFLAGS+=-I${.CURDIR}/../krb/${__objdir}
 .else
 CFLAGS+=-I${.CURDIR}/../krb
 .endif
-.if exists(${.CURDIR}/../ss/obj)
-CFLAGS+=-I${.CURDIR}/../ss/obj
+.if exists(${.CURDIR}/../ss/${__objdir})
+CFLAGS+=-I${.CURDIR}/../ss/${__objdir}
 .else
 CFLAGS+=-I${.CURDIR}/../ss
 .endif