com_err/compile_et changes

5 files changed, 10 insertions, 13 deletions

diff --git a/kerberosIV/Makefile b/kerberosIV/Makefile
index 4a12509bd17..27775368d49 100644
--- a/kerberosIV/Makefile
+++ b/kerberosIV/Makefile
@@ -1,10 +1,10 @@
-#	$OpenBSD: Makefile,v 1.6 1996/11/11 04:42:25 downsj Exp $
+#	$OpenBSD: Makefile,v 1.7 1996/11/11 05:35:12 downsj Exp $
 #	from @(#)Makefile	5.1 (Berkeley) 6/25/90
 
-# do compile_et and mk_cmds first, used by other directories
+# do mk_cmds first, used by other directories
 
 .ifnmake install
-SUBDIR=	compile_et mk_cmds
+SUBDIR=	mk_cmds
 .endif
 
 .ifmake includes
@@ -22,7 +22,6 @@ SUBDIR+=man
 build:
 	(cd ${.CURDIR}/include && ${MAKE} includes)
 	${MAKE} cleandir
-	(cd ${.CURDIR}/compile_et && ${MAKE} depend && ${MAKE})
 	${MAKE} includes
 	(cd ${.CURDIR}/mk_cmds && ${MAKE} depend && ${MAKE})
 	(cd ${.CURDIR}/acl && ${MAKE} depend && ${MAKE} && ${MAKE} install)
@@ -36,7 +35,6 @@ build:
 # Since depending need to have some dynamically built sources available,
 # we need to build the generators first.
 beforedepend:
-	(cd ${.CURDIR}/compile_et && ${MAKE} depend && ${MAKE})
 	(cd ${.CURDIR}/mk_cmds && ${MAKE} depend && ${MAKE})
 
 .include <bsd.dep.mk>
diff --git a/kerberosIV/Makefile.inc b/kerberosIV/Makefile.inc
index c5497ca1272..62a2a9d188a 100644
--- a/kerberosIV/Makefile.inc
+++ b/kerberosIV/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.4 1996/11/11 04:42:26 downsj Exp $
+#	$OpenBSD: Makefile.inc,v 1.5 1996/11/11 05:35:13 downsj Exp $
 
 CFLAGS+=-I${.CURDIR}/../include
 BINDIR?=/usr/sbin
@@ -16,7 +16,9 @@ MK_CMDS=${.CURDIR}/../mk_cmds/mk_cmds
 .endif
 
 .if (${MACHINE_ARCH} != "mips")
-COM_ERR_PIC=	-lcom_err_pic
+COM_ERR=	-lcom_err_pic
 .else
-COM_ERR_PIC=	-lcom_err
+COM_ERR=	-lcom_err
 .endif
+
+COMPILE_ET?=	/usr/libexec/compile_et
diff --git a/kerberosIV/kadm/Makefile b/kerberosIV/kadm/Makefile
index 46b1ac5376a..ac960208a18 100644
--- a/kerberosIV/kadm/Makefile
+++ b/kerberosIV/kadm/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.4 1996/08/31 18:47:27 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.5 1996/11/11 05:35:15 downsj Exp $
 
 LIB=	kadm
 SRCS=	kadm_err.c kadm_cli_wrap.c kadm_stream.c kadm_supp.c
@@ -13,7 +13,6 @@ CLEANFILES+=	kadm_err.c kadm_err.h
 
 kadm_err.c kadm_err.h: kadm_err.et
 	test -e kadm_err.et || ln -s ${.CURDIR}/kadm_err.et .
-	cd ${.CURDIR}/../compile_et; ${MAKE}
 	${COMPILE_ET} kadm_err.et
 	-test -h kadm_err.et && rm kadm_err.et
 
diff --git a/kerberosIV/krb/Makefile b/kerberosIV/krb/Makefile
index 6e3215a8aee..95cb9387ab6 100644
--- a/kerberosIV/krb/Makefile
+++ b/kerberosIV/krb/Makefile
@@ -32,7 +32,6 @@ CLEANFILES+=	krb_err.c krb_err.h
 
 krb_err.c krb_err.h: krb_err.et
 	test -e krb_err.et || ln -s ${.CURDIR}/krb_err.et .
-	cd ${.CURDIR}/../compile_et; ${MAKE}
 	${COMPILE_ET} krb_err.et
 	-test -h krb_err.et && rm krb_err.et
 
diff --git a/kerberosIV/ss/Makefile b/kerberosIV/ss/Makefile
index d5d1426755e..2ab09cea7d1 100644
--- a/kerberosIV/ss/Makefile
+++ b/kerberosIV/ss/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.5 1996/08/31 18:47:39 deraadt Exp $
+#	$Id: Makefile,v 1.6 1996/11/11 05:35:17 downsj Exp $
 
 LIB=	ss
 SRCS=	ss_err.c data.c error.c execute_cmd.c help.c invocation.c list_rqs.c \
@@ -10,7 +10,6 @@ CLEANFILES+=	ss_err.c ss_err.h std_rqs.c ss
 
 ss_err.h ss_err.c:	${.CURDIR}/ss_err.et
 	test -e ss_err.et || ln -s ${.CURDIR}/ss_err.et .
-	cd ${.CURDIR}/../compile_et; ${MAKE}
 	${COMPILE_ET} ss_err.et
 	-test -h ss_err.et && rm ss_err.et