hacks to make it fit, parts by niklas

diff --git a/distrib/i386/floppies/Makefile.inc b/distrib/i386/floppies/Makefile.inc
index 672c24a..d53c8c3 100644 (file)
--- a/distrib/i386/floppies/Makefile.inc
+++ b/distrib/i386/floppies/Makefile.inc
@@ -1,6 +1,8 @@
-#      $OpenBSD: Makefile.inc,v 1.6 1996/10/01 01:54:22 deraadt Exp $
+#      $OpenBSD: Makefile.inc,v 1.7 1997/01/25 09:16:36 deraadt Exp $
 
 # Revision is 2.0
 # all these private copies of the version number really lose.
 REV=   20
 FLOPPY3=1
+
+.include <bsd.own.mk>

diff --git a/distrib/i386/floppies/inst-common/Makefile.inc b/distrib/i386/floppies/inst-common/Makefile.inc
index b45ea0f..a8b0795 100644 (file)
--- a/distrib/i386/floppies/inst-common/Makefile.inc
+++ b/distrib/i386/floppies/inst-common/Makefile.inc
@@ -1,4 +1,4 @@
-#      $Id: Makefile.inc,v 1.12 1996/12/21 19:21:47 kstailey Exp $
+#      $Id: Makefile.inc,v 1.13 1997/01/25 09:16:39 deraadt Exp $
 
 # TOP is assumed to be defined by Makefile including this one.
 
@@ -53,10 +53,14 @@ unconfig:
        -/bin/rm -f ${IMAGE}
 
 ${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF}
-       crunchgen -D ${TOP}/../../.. -L ${DESTDIR}/usr/lib ${CRUNCHCONF}
+       crunchgen -D ${TOP}/../../.. -m ${CBIN}.mk -L ${DESTDIR}/usr/lib \
+                 ${CRUNCHCONF}
 
 ${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c
        make -f ${CBIN}.mk all
+.if defined(KERBEROS)
+       mv ${CBIN}-krb ${CBIN}
+.endif
 
 install:
        cp ${IMAGE} ${DESTDIR}/snapshot/

diff --git a/distrib/i386/floppies/kc/Makefile b/distrib/i386/floppies/kc/Makefile
index 28bebac..4b73a82 100644 (file)
--- a/distrib/i386/floppies/kc/Makefile
+++ b/distrib/i386/floppies/kc/Makefile
@@ -1,4 +1,4 @@
-#      $Id: Makefile,v 1.11 1996/12/21 05:20:25 deraadt Exp $
+#      $Id: Makefile,v 1.12 1997/01/25 09:16:42 deraadt Exp $
 
 TOP=           ${.CURDIR}/..
 
@@ -23,6 +23,7 @@ bsd:
        cd ${.CURDIR}/../../../../sys/arch/i386/compile/INST && \
            make clean && make depend && make
        cp ${.CURDIR}/../../../../sys/arch/i386/compile/INST/bsd bsd
+       strip bsd
 
 all: bsd ${CBIN}
 .ifndef FLOPPY3