2 files changed, 27 insertions, 66 deletions

diff --git a/kerberosIV/Makefile b/kerberosIV/Makefile
index 9c962efbb200..e3681558e2d1 100644
--- a/kerberosIV/Makefile
+++ b/kerberosIV/Makefile
@@ -4,68 +4,33 @@ MAINTAINER=	markm@FreeBSD.org
 
 SUBDIR=	include lib libexec usr.bin usr.sbin
 
-SDIR= ${.CURDIR}/..
+# These are the programs which depend on Kerberos.
+KPROGS=	bin/rcp libexec/ftpd libexec/rlogind libexec/rshd \
+	sbin/dump sbin/restore usr.bin/login usr.bin/passwd \
+	usr.bin/rlogin usr.bin/rsh usr.bin/su
+# kerberosIV'ed cvs is broken
+#KPROGS+=gnu/usr.bin/cvs
 
-CODAI=	${MAKE} ${MFLAGS} MAKE_KERBEROS4=yes cleandir && \
-	${MAKE} ${MFLAGS} MAKE_KERBEROS4=yes obj && \
-	${MAKE} ${MFLAGS} MAKE_KERBEROS4=yes depend all install
+# This target is used to rebuild these programs WITH Kerberos.
+kerberize:
+.for entry in ${KPROGS}
+	cd ${.CURDIR}/../${entry}; \
+	${MAKE} ${MFLAGS} -DMAKE_KERBEROS4 cleandir; \
+	${MAKE} ${MFLAGS} -DMAKE_KERBEROS4 obj; \
+	${MAKE} ${MFLAGS} -DMAKE_KERBEROS4 depend; \
+	${MAKE} ${MFLAGS} -DMAKE_KERBEROS4 all; \
+	${MAKE} ${MFLAGS} -DMAKE_KERBEROS4 install
+.endfor
 
-CODAIN=	${MAKE} ${MFLAGS} cleandir && \
-	${MAKE} ${MFLAGS} obj && \
-	${MAKE} ${MFLAGS} depend all install
-
-CODAD=	${MAKE} ${MFLAGS} MAKE_KERBEROS4=yes cleandir && \
-	${MAKE} ${MFLAGS} MAKE_KERBEROS4=yes obj && \
-	${MAKE} ${MFLAGS} MAKE_KERBEROS4=yes depend all distribute
-
-# These are the programs which depend on kerberos
-kprog:
-	cd ${SDIR}/bin/rcp; ${CODAI}
-	echo "WARNING: kerberosIV'ed cvs broken"
-	#cd ${SDIR}/gnu/usr.bin/cvs; ${CODAI}
-	cd ${SDIR}/libexec/ftpd; ${CODAI}
-	cd ${SDIR}/libexec/rlogind; ${CODAI}
-	cd ${SDIR}/libexec/rshd; ${CODAI}
-	cd ${SDIR}/usr.bin/login; ${CODAI}
-	cd ${SDIR}/usr.bin/passwd; ${CODAI}
-	cd ${SDIR}/usr.bin/rlogin; ${CODAI}
-	cd ${SDIR}/usr.bin/rsh; ${CODAI}
-	cd ${SDIR}/usr.bin/su; ${CODAI}
-	cd ${SDIR}/sbin/dump; ${CODAI}
-	cd ${SDIR}/sbin/restore; ${CODAI}
-
-# These are the programs which depend on kerberos
-# This target us used to rebuild these programs WITHOUT kerberos
-dekerberise:
-	cd ${SDIR}/bin/rcp; ${CODAIN}
-	echo "WARNING: kerberosIV'ed cvs broken"
-	#cd ${SDIR}/gnu/usr.bin/cvs; ${CODAIN}
-	cd ${SDIR}/libexec/ftpd; ${CODAIN}
-	cd ${SDIR}/libexec/rlogind; ${CODAIN}
-	cd ${SDIR}/libexec/rshd; ${CODAIN}
-	cd ${SDIR}/usr.bin/login; ${CODAIN}
-	cd ${SDIR}/usr.bin/passwd; ${CODAIN}
-	cd ${SDIR}/usr.bin/rlogin; ${CODAIN}
-	cd ${SDIR}/usr.bin/rsh; ${CODAIN}
-	cd ${SDIR}/usr.bin/su; ${CODAIN}
-	cd ${SDIR}/sbin/dump; ${CODAIN}
-	cd ${SDIR}/sbin/restore; ${CODAIN}
-
-bootstrap: cleandir obj depend all install kprog
-
-help-distribute:	distribute
-	cd ${SDIR}/bin/rcp; ${CODAD}
-	echo "WARNING: kerberosIV'ed cvs broken"
-	#cd ${SDIR}/gnu/usr.bin/cvs; ${CODAD}
-	cd ${SDIR}/libexec/ftpd; ${CODAD}
-	cd ${SDIR}/libexec/rlogind; ${CODAD}
-	cd ${SDIR}/libexec/rshd; ${CODAD}
-	cd ${SDIR}/usr.bin/login; ${CODAD}
-	cd ${SDIR}/usr.bin/passwd; ${CODAD}
-	cd ${SDIR}/usr.bin/rlogin; ${CODAD}
-	cd ${SDIR}/usr.bin/rsh; ${CODAD}
-	cd ${SDIR}/usr.bin/su; ${CODAD}
-	cd ${SDIR}/sbin/dump; ${CODAD}
-	cd ${SDIR}/sbin/restore; ${CODAD}
+# This target is used to rebuild these programs WITHOUT Kerberos.
+dekerberize:
+.for entry in ${KPROGS}
+	cd ${.CURDIR}/../${entry}; \
+	${MAKE} ${MFLAGS} cleandir; \
+	${MAKE} ${MFLAGS} obj; \
+	${MAKE} ${MFLAGS} depend; \
+	${MAKE} ${MFLAGS} all; \
+	${MAKE} ${MFLAGS} install
+.endfor
 
 .include <bsd.subdir.mk>
diff --git a/kerberosIV/Makefile.inc b/kerberosIV/Makefile.inc
index e41579265309..d21105cb9855 100644
--- a/kerberosIV/Makefile.inc
+++ b/kerberosIV/Makefile.inc
@@ -1,8 +1,6 @@
 # $FreeBSD$
 
-.if !defined(DISTRIBUTION)
-
-DISTRIBUTION=	krb4
+DISTRIBUTION?=	krb4
 
 .if !defined(INCLUDEOBJDIR)
 
@@ -106,5 +104,3 @@ beforeinstall: ${INCLUDES}
 KRB4DIR=	${.CURDIR}/../../crypto/kerberosIV
 
 .endif
-
-.endif