Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/distrib yet another distrib overhaul:



details:   https://anonhg.NetBSD.org/src/rev/f07714152ac3
branches:  trunk
changeset: 526360:f07714152ac3
user:      lukem <lukem%NetBSD.org@localhost>
date:      Thu May 02 18:02:14 2002 +0000

description:
yet another distrib overhaul:
- move guts of distrib/Makefile.inc to distrib/common/Makefile.distrib
  (fixes problem caused by implicit include of ../Makefile.inc in certain
  submake conditions triggered by makefiles not yet in tree)
- removed mkdir of ${RELEASEDIR}/*;  rely upon "snap_pre" target of
  etc/Makefile to create all the release directories
- renamed RELINSTALL to RELEASE_INSTALL
- renamed FLOPPYINSTDIR to FLOPPY_RELEASEDIR
- renamed MDSETDIR to MDSET_RELEASEDIR
- removed ITARGET
- move release target from top level to appropriate subdirectory
- ensure release target has correct depends
- replace miniroot's IMAGE_MD_POST with common/Makefile.image IMAGEPOSTBUILD
- Makefile.image: add realall: ${IMAGE}

diffstat:

 distrib/Makefile.inc                                                |   18 +-
 distrib/acorn26/Makefile                                            |    7 +-
 distrib/acorn26/instkernel/Makefile                                 |    8 +-
 distrib/acorn32/Makefile                                            |   35 +-
 distrib/acorn32/kernels/Makefile                                    |    6 +-
 distrib/acorn32/ramdisk/Makefile                                    |   12 +-
 distrib/alpha/Makefile                                              |   23 +-
 distrib/alpha/floppy-GENERIC/Makefile                               |   12 +-
 distrib/alpha/instkernel/Makefile                                   |    6 +-
 distrib/alpha/instkernel/cd-hd-tape/Makefile                        |    8 +-
 distrib/alpha/instkernel/fdset/Makefile                             |   10 +-
 distrib/alpha/instkernel/instkernel/Makefile                        |    8 +-
 distrib/alpha/instkernel/ramdisk/Makefile                           |   14 +-
 distrib/alpha/instkernel/ramdisk/install.sh                         |  527 ++++++++++
 distrib/alpha/instkernel/ramdisk/list                               |    6 +-
 distrib/alpha/instkernel/ramdisk/upgrade.sh                         |  262 ++++
 distrib/alpha/instkernel/src/install.sh                             |  527 ----------
 distrib/alpha/instkernel/src/upgrade.sh                             |  262 ----
 distrib/amiga/miniroot/Makefile.inc                                 |    4 +-
 distrib/arc/Makefile                                                |    5 +-
 distrib/arc/instkernel/Makefile                                     |    6 +-
 distrib/arc/ramdisk/Makefile                                        |   11 +-
 distrib/atari/Makefile                                              |    7 +-
 distrib/atari/floppies/Makefile                                     |    8 +-
 distrib/atari/floppies/Makefile.inc                                 |    3 -
 distrib/atari/floppies/common/Makefile.images                       |   39 +-
 distrib/atari/floppies/install/Makefile                             |    9 +-
 distrib/atari/floppies/prepare/Makefile                             |   10 +-
 distrib/cats/instkernel/Makefile                                    |    6 +-
 distrib/cats/ramdisk/Makefile                                       |   12 +-
 distrib/common/Makefile.distrib                                     |   20 +
 distrib/common/Makefile.image                                       |   35 +-
 distrib/common/Makefile.mdset                                       |   10 +-
 distrib/common/Makefile.tarfloppy                                   |   28 +-
 distrib/evbarm/Makefile                                             |    4 +-
 distrib/evbarm/gzboot/gzboot_IQ80310_flash_0x00080000/Makefile      |    4 +-
 distrib/evbarm/gzboot/gzboot_IQ80321_flash_0xf0080000/Makefile      |    4 +-
 distrib/evbarm/gzboot/gzboot_TEAMASA_NPWR_flash_0x00080000/Makefile |    4 +-
 distrib/evbarm/gzboot/gzimg/Makefile                                |   12 +-
 distrib/evbarm/instkernel/Makefile                                  |    6 +-
 distrib/evbarm/instkernel/instkernel/Makefile                       |    6 +-
 distrib/evbarm/instkernel/ramdisk/Makefile                          |   11 +-
 distrib/hp300/Makefile                                              |    9 +-
 distrib/hp300/instkernel/Makefile                                   |    6 +-
 distrib/hp300/ramdisk/Makefile                                      |   11 +-
 distrib/hpcmips/Makefile                                            |   19 +-
 distrib/i386/Makefile                                               |    7 +-
 distrib/i386/floppies/common/Makefile.bootfloppy                    |    6 +-
 distrib/i386/floppies/common/Makefile.ramdisk                       |   11 +-
 distrib/i386/floppies/kernel-ramdisk/Makefile                       |    6 +-
 distrib/i386/floppies/kernel-rescue/Makefile                        |    6 +-
 distrib/mac68k/Makefile                                             |    6 +-
 distrib/mac68k/instkernel/Makefile                                  |    7 +-
 distrib/mac68k/instkernel/instkernel/Makefile                       |    6 +-
 distrib/mac68k/instkernel/ramdisk/Makefile                          |   11 +-
 distrib/macppc/Makefile                                             |   15 +-
 distrib/macppc/floppies/bootfloppy/Makefile                         |    7 +-
 distrib/macppc/floppies/md-kernel/Makefile                          |    6 +-
 distrib/macppc/floppies/ramdisk/Makefile                            |   11 +-
 distrib/miniroot/Makefile                                           |   25 +-
 distrib/mipsco/instkernel/Makefile                                  |   34 +-
 distrib/mipsco/ramdisk/Makefile                                     |   14 +-
 distrib/mvme68k/instkernel/Makefile                                 |    6 +-
 distrib/mvme68k/ramdisk/Makefile                                    |   11 +-
 distrib/news68k/Makefile                                            |    5 +-
 distrib/news68k/floppies/bootfloppy/Makefile                        |    7 +-
 distrib/news68k/floppies/ramdisk-kernel/Makefile                    |    6 +-
 distrib/news68k/floppies/ramdisk/Makefile                           |    9 +-
 distrib/newsmips/Makefile                                           |    5 +-
 distrib/newsmips/floppies/bootfloppy/Makefile                       |    7 +-
 distrib/newsmips/floppies/instkernel/Makefile                       |    6 +-
 distrib/newsmips/floppies/ramdisk/Makefile                          |   11 +-
 distrib/notes/Makefile                                              |    4 +-
 distrib/notes/Makefile.inc                                          |    8 +-
 distrib/playstation2/Makefile                                       |    6 +-
 distrib/pmax/instkernel/Makefile                                    |   32 +-
 distrib/pmax/miniroot/Makefile.inc                                  |    4 +-
 distrib/pmax/ramdisk/Makefile                                       |   14 +-
 distrib/prep/floppies/bootfloppy-common/Makefile.inc                |    7 +-
 distrib/prep/floppies/kernel-generic/Makefile                       |    7 +-
 distrib/prep/floppies/kernel-ramdisk/Makefile                       |    6 +-
 distrib/prep/floppies/ramdisk/Makefile                              |   11 +-
 distrib/sandpoint/floppies/md-kernel/Makefile                       |    6 +-
 distrib/sandpoint/floppies/ramdisk/Makefile                         |   11 +-
 distrib/sets/Makefile                                               |    4 +-
 distrib/shark/instkernel/instkernel/Makefile                        |    6 +-
 distrib/shark/instkernel/ramdisk/Makefile                           |   11 +-
 distrib/sparc/bootfs/Makefile                                       |   29 +-
 distrib/sparc/instfs/Makefile                                       |   21 +-
 distrib/sparc/miniroot/Makefile.inc                                 |    4 +-
 distrib/sparc/ramdisk/Makefile                                      |   12 +-
 distrib/sparc64/instfs/Makefile                                     |   13 +-
 distrib/sparc64/xminiroot/Makefile                                  |   26 +-
 distrib/sun2/Makefile                                               |   13 +-
 distrib/sun2/miniroot/Makefile                                      |   23 +-
 distrib/sun2/ramdisk/Makefile                                       |    8 +-
 distrib/sun3/Makefile                                               |   18 +-
 distrib/sun3/miniroot/Makefile                                      |   23 +-
 distrib/sun3/ramdisk/Makefile                                       |   21 +-
 distrib/vax/Makefile                                                |   20 +-
 distrib/vax/Makefile.inc                                            |    4 -
 distrib/vax/floppy/Makefile                                         |    7 +-
 distrib/vax/miniroot/Makefile.inc                                   |    4 +-
 distrib/vax/ramdisk-kernel/Makefile                                 |    8 +-
 distrib/vax/ramdisk/Makefile                                        |   11 +-
 distrib/x68k/Makefile                                               |    7 +-
 distrib/x68k/floppies/bootfloppy-common/Makefile.inc                |   23 +-
 distrib/x68k/floppies/inst/Makefile                                 |   14 +-
 distrib/x68k/floppies/instkernel-common/Makefile.inc                |   18 +-
 109 files changed, 1278 insertions(+), 1497 deletions(-)

diffs (truncated from 4377 to 300 lines):

diff -r c9ea993b0271 -r f07714152ac3 distrib/Makefile.inc
--- a/distrib/Makefile.inc      Thu May 02 18:00:40 2002 +0000
+++ b/distrib/Makefile.inc      Thu May 02 18:02:14 2002 +0000
@@ -1,19 +1,3 @@
-#      $NetBSD: Makefile.inc,v 1.7 2002/04/26 15:50:21 lukem Exp $
+#      $NetBSD: Makefile.inc,v 1.8 2002/05/02 18:02:14 lukem Exp $
 
 .include "../Makefile.inc"
-
-# DISTRIBDIR - Top level of distrib
-#
-DISTRIBDIR=    ${NETBSDSRCDIR}/distrib
-
-# DISTRIBREV - NetBSD version without dots, as in "15ZD"
-# DISTRIBVER - NetBSD version with dots, as in "1.5ZD"
-#
-DISTRIBREV!=   sh ${NETBSDSRCDIR}/sys/conf/osrelease.sh -s
-DISTRIBVER!=   sh ${NETBSDSRCDIR}/sys/conf/osrelease.sh
-
-# MAKESUMS -   runs makesums with the appropriate environment setup
-# RELINSTALL - installs release binaries
-#
-MAKESUMS=      CKSUM=${CKSUM:Q} sh ${DISTRIBDIR}/sets/makesums
-RELINSTALL=    ${INSTALL} ${RENAME} ${PRESERVE} ${COPY} -m ${NONBINMODE}
diff -r c9ea993b0271 -r f07714152ac3 distrib/acorn26/Makefile
--- a/distrib/acorn26/Makefile  Thu May 02 18:00:40 2002 +0000
+++ b/distrib/acorn26/Makefile  Thu May 02 18:02:14 2002 +0000
@@ -1,7 +1,6 @@
-#      $NetBSD: Makefile,v 1.2 2002/04/22 19:24:28 bjh21 Exp $
+#      $NetBSD: Makefile,v 1.3 2002/05/02 18:02:16 lukem Exp $
 
-SUBDIR=        instkernel
-
-TARGETS+=release
+SUBDIR=                instkernel
+TARGETS+=      release
 
 .include <bsd.subdir.mk>
diff -r c9ea993b0271 -r f07714152ac3 distrib/acorn26/instkernel/Makefile
--- a/distrib/acorn26/instkernel/Makefile       Thu May 02 18:00:40 2002 +0000
+++ b/distrib/acorn26/instkernel/Makefile       Thu May 02 18:02:14 2002 +0000
@@ -1,7 +1,7 @@
-#      $NetBSD: Makefile,v 1.4 2002/04/30 15:37:33 lukem Exp $
+#      $NetBSD: Makefile,v 1.5 2002/05/02 18:02:17 lukem Exp $
 
 .include <bsd.own.mk>
-.include "${NETBSDSRCDIR}/distrib/Makefile.inc"
+.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
 
 IMAGE=         ramdisk.fs
 IMAGESIZE=     1924k
@@ -26,8 +26,8 @@
 .include       "${HACKSRC}/Makefile.inc"
 ${CRUNCHBIN}:  libhack.o
 
-MDSETTARGETS=  INSTALL         ramdisk.fs      -
-MDSETDIR=      installation/misc
+MDSETTARGETS=          INSTALL ${IMAGE} -
+MDSET_RELEASEDIR=      installation/misc
 
 .include "${DISTRIBDIR}/common/Makefile.crunch"
 .include "${DISTRIBDIR}/common/Makefile.makedev"
diff -r c9ea993b0271 -r f07714152ac3 distrib/acorn32/Makefile
--- a/distrib/acorn32/Makefile  Thu May 02 18:00:40 2002 +0000
+++ b/distrib/acorn32/Makefile  Thu May 02 18:02:14 2002 +0000
@@ -1,33 +1,24 @@
-# $NetBSD: Makefile,v 1.13 2002/04/26 15:50:23 lukem Exp $
+# $NetBSD: Makefile,v 1.14 2002/05/02 18:02:17 lukem Exp $
 
 .include <bsd.own.mk>
-.include "${NETBSDSRCDIR}/distrib/Makefile.inc"
-
-ITARGET=       ${RELEASEDIR}/installation
-KERNELS=       INSTALL
+.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
 
 SUBDIR=                ramdisk .WAIT kernels
-
-.include <bsd.subdir.mk>
-
-RAMDISKOBJ!=   cd ${.CURDIR}/ramdisk && ${PRINTOBJDIR}
-KERNELOBJ!=    cd ${.CURDIR}/kernels && ${PRINTOBJDIR}
+TARGETS+=      release
 
 release: check_RELEASEDIR
-       ${RELINSTALL} ${RAMDISKOBJ}/ramdisk.fs \
-           ${ITARGET}/misc/ramdisk-${DISTRIBREV}.fs
-       gzip -9f ${ITARGET}/misc/ramdisk-${DISTRIBREV}.fs
-.for kern in ${KERNELS}
-       ${RELINSTALL} ${KERNELOBJ}/netbsd.${kern}.gz ${ITARGET}/kernel/
-.endfor
        cd ${NETBSDSRCDIR}/sys/arch/acorn32/stand && \
                ./export-BtNetBSD && \
-               rm -f ${ITARGET}/misc/BtNetBSD.tgz && \
-               gzip -9 -c BtNetBSD.tar > ${ITARGET}/misc/BtNetBSD.tgz && \
+               rm -f ${RELEASEDIR}/installation/misc/BtNetBSD.tgz && \
+               gzip -9 -c BtNetBSD.tar > \
+                   ${RELEASEDIR}/installation/misc/BtNetBSD.tgz && \
                rm -f BtNetBSD.tar && \
-               mv -f BtNetBSD.zip ${ITARGET}/misc && \
-       ${RELINSTALL} ${DISTRIBDIR}/notes/acorn32/prep.RISCOS ${RELEASEDIR}/ && \
+               mv -f BtNetBSD.zip ${RELEASEDIR}/installation/misc && \
+               ${RELEASE_INSTALL} ${DISTRIBDIR}/notes/acorn32/prep.RISCOS \
+                   ${RELEASEDIR}/
        cd ${.CURDIR} && \
-               rm -f ${ITARGET}/misc/gzip_ff8.bin && \
+               rm -f ${RELEASEDIR}/installation/misc/gzip_ff8.bin && \
                uudecode < gzip_ff8.bin.uue && \
-               mv -f gzip_ff8.bin ${ITARGET}/misc/
+               mv -f gzip_ff8.bin ${RELEASEDIR}/installation/misc/
+
+.include <bsd.subdir.mk>
diff -r c9ea993b0271 -r f07714152ac3 distrib/acorn32/kernels/Makefile
--- a/distrib/acorn32/kernels/Makefile  Thu May 02 18:00:40 2002 +0000
+++ b/distrib/acorn32/kernels/Makefile  Thu May 02 18:02:14 2002 +0000
@@ -1,13 +1,13 @@
-#      $NetBSD: Makefile,v 1.13 2002/04/26 15:50:23 lukem Exp $
+#      $NetBSD: Makefile,v 1.14 2002/05/02 18:02:17 lukem Exp $
 
 .include <bsd.own.mk>
-.include "${NETBSDSRCDIR}/distrib/Makefile.inc"
+.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
 
 RAMDISKDIR!=   cd ${.CURDIR}/../ramdisk && ${PRINTOBJDIR}
 RAMDISK=       ${RAMDISKDIR}/ramdisk.fs
 MDSETTARGETS=  INSTALL ${RAMDISK} -
 
-MDSETDIR=      binary/kernel
+MDSET_RELEASEDIR=      installation/kernel
 
 .include "${DISTRIBDIR}/common/Makefile.mdset"
 
diff -r c9ea993b0271 -r f07714152ac3 distrib/acorn32/ramdisk/Makefile
--- a/distrib/acorn32/ramdisk/Makefile  Thu May 02 18:00:40 2002 +0000
+++ b/distrib/acorn32/ramdisk/Makefile  Thu May 02 18:02:14 2002 +0000
@@ -1,7 +1,7 @@
-#      $NetBSD: Makefile,v 1.13 2002/04/26 15:50:23 lukem Exp $
+#      $NetBSD: Makefile,v 1.14 2002/05/02 18:02:18 lukem Exp $
 
 .include <bsd.own.mk>
-.include "${NETBSDSRCDIR}/distrib/Makefile.inc"
+.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
 
 IMAGE=         ramdisk.fs
 IMAGESIZE=     1924k
@@ -21,17 +21,13 @@
                ${NETBSDSRCDIR}/etc/netconfig ${NETBSDSRCDIR}/etc/protocols \
                ${NETBSDSRCDIR}/etc/services
 
+IMAGE_RELEASEDIR=      installation/misc
+
 # Use stubs to eliminate some large stuff from libc
 HACKSRC=       ${DISTRIBDIR}/utils/libhack
 .include       "${HACKSRC}/Makefile.inc"
 ${CRUNCHBIN}:  libhack.o
 
-
-realall: ${IMAGE}
-
-release:
-
-
 .include "${DISTRIBDIR}/common/Makefile.crunch"
 .include "${DISTRIBDIR}/common/Makefile.makedev"
 .include "${DISTRIBDIR}/common/Makefile.image"
diff -r c9ea993b0271 -r f07714152ac3 distrib/alpha/Makefile
--- a/distrib/alpha/Makefile    Thu May 02 18:00:40 2002 +0000
+++ b/distrib/alpha/Makefile    Thu May 02 18:02:14 2002 +0000
@@ -1,25 +1,14 @@
-#      $NetBSD: Makefile,v 1.19 2002/05/02 13:04:48 lukem Exp $
+#      $NetBSD: Makefile,v 1.20 2002/05/02 18:02:18 lukem Exp $
 
 .include <bsd.own.mk>
-.include "${NETBSDSRCDIR}/distrib/Makefile.inc"
+.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
 
 SUBDIR=                instkernel      # floppy-GENERIC
-
-ITARGET=       ${RELEASEDIR}/installation
-
-CDHDTAPEOBJ!=  cd ${.CURDIR}/instkernel/cd-hd-tape && ${PRINTOBJDIR}
-FDSETOBJ!=     cd ${.CURDIR}/instkernel/fdset && ${PRINTOBJDIR}
-INSTKERNOBJ!=  cd ${.CURDIR}/instkernel/instkernel && ${PRINTOBJDIR}
-GENERICOBJ!=   cd ${.CURDIR}/floppy-GENERIC && ${PRINTOBJDIR}
+TARGETS+=      release
 
-release: check_RELEASEDIR
-.for i in floppy diskimage instkernel tapeimage
-       ${RELINSTALL} ${.CURDIR}/README.files ${ITARGET}/$i/.
+release: check_RELEASEDIR .WAIT README.files
+.for i in floppy diskimage instkernel
+       ${RELEASE_INSTALL} ${.CURDIR}/README.files ${RELEASEDIR}/installation/$i
 .endfor
-       ${RELINSTALL} ${CDHDTAPEOBJ}/cdhdtape1.fs ${ITARGET}/diskimage/cdhdtape
-       ${RELINSTALL} ${FDSETOBJ}/disk1.fs ${ITARGET}/floppy/disk1of2
-       ${RELINSTALL} ${FDSETOBJ}/disk2.fs ${ITARGET}/floppy/disk2of2
-       ${RELINSTALL} ${INSTKERNOBJ}/netbsd.INSTALL.gz ${ITARGET}/instkernel/netbsd.gz
-#      ${RELINSTALL} ${GENERICOBJ}/GENERIC.fs ${ITARGET}/misc/.
 
 .include <bsd.subdir.mk>
diff -r c9ea993b0271 -r f07714152ac3 distrib/alpha/floppy-GENERIC/Makefile
--- a/distrib/alpha/floppy-GENERIC/Makefile     Thu May 02 18:00:40 2002 +0000
+++ b/distrib/alpha/floppy-GENERIC/Makefile     Thu May 02 18:02:14 2002 +0000
@@ -1,6 +1,8 @@
-#      $NetBSD: Makefile,v 1.14 2002/04/14 08:30:41 lukem Exp $
+#      $NetBSD: Makefile,v 1.15 2002/05/02 18:02:18 lukem Exp $
 
-.include "../../../Makefile.inc"
+.include <bsd.own.mk>
+.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
+
 .include <bsd.kernobj.mk>
 
 MOUNT_POINT?=  /mnt
@@ -60,5 +62,7 @@
 # nothing to do here
 depend includes lint regress tags:
 
-.include <bsd.own.mk>
-.include <bsd.obj.mk>
+release: check_RELEASEDIR .WAIT GENERIC.fs
+       ${RELEASE_INSTALL} GENERIC.fs ${RELEASEDIR}/installation/misc
+
+.include <bsd.prog.mk>
diff -r c9ea993b0271 -r f07714152ac3 distrib/alpha/instkernel/Makefile
--- a/distrib/alpha/instkernel/Makefile Thu May 02 18:00:40 2002 +0000
+++ b/distrib/alpha/instkernel/Makefile Thu May 02 18:02:14 2002 +0000
@@ -1,5 +1,7 @@
-#      $NetBSD: Makefile,v 1.3 2002/02/11 07:32:54 thorpej Exp $
+#      $NetBSD: Makefile,v 1.4 2002/05/02 18:02:19 lukem Exp $
 
-SUBDIR=        ramdisk .WAIT instkernel .WAIT fdset cd-hd-tape
+SUBDIR=                ramdisk .WAIT instkernel .WAIT fdset cd-hd-tape
+
+TARGETS+=      release
 
 .include <bsd.subdir.mk>
diff -r c9ea993b0271 -r f07714152ac3 distrib/alpha/instkernel/cd-hd-tape/Makefile
--- a/distrib/alpha/instkernel/cd-hd-tape/Makefile      Thu May 02 18:00:40 2002 +0000
+++ b/distrib/alpha/instkernel/cd-hd-tape/Makefile      Thu May 02 18:02:14 2002 +0000
@@ -1,7 +1,7 @@
-#      $NetBSD: Makefile,v 1.10 2002/05/02 13:04:49 lukem Exp $
+#      $NetBSD: Makefile,v 1.11 2002/05/02 18:02:19 lukem Exp $
 
 .include <bsd.own.mk>
-.include "${NETBSDSRCDIR}/distrib/Makefile.inc"
+.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
 
 FLOPPYBASE=    cdhdtape
 FLOPPYSIZE=    5760
@@ -18,4 +18,8 @@
 
 .include "${DISTRIBDIR}/common/Makefile.tarfloppy"
 
+release: check_RELEASEDIR .WAIT ${FLOPPYBASE}1.fs
+       ${RELEASE_INSTALL} ${FLOPPYBASE}1.fs \
+           ${RELEASEDIR}/installation/diskimage/cdhdtape
+
 .include <bsd.prog.mk>
diff -r c9ea993b0271 -r f07714152ac3 distrib/alpha/instkernel/fdset/Makefile
--- a/distrib/alpha/instkernel/fdset/Makefile   Thu May 02 18:00:40 2002 +0000
+++ b/distrib/alpha/instkernel/fdset/Makefile   Thu May 02 18:02:14 2002 +0000
@@ -1,7 +1,7 @@
-#      $NetBSD: Makefile,v 1.9 2002/04/30 15:08:45 lukem Exp $
+#      $NetBSD: Makefile,v 1.10 2002/05/02 18:02:20 lukem Exp $
 
 .include <bsd.own.mk>
-.include "${NETBSDSRCDIR}/distrib/Makefile.inc"
+.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
 
 FLOPPYBASE=    disk
 FLOPPYSIZE=    2880
@@ -17,4 +17,10 @@
 
 .include "${DISTRIBDIR}/common/Makefile.tarfloppy"
 
+release: check_RELEASEDIR .WAIT ${FLOPPYBASE}1.fs
+       ${RELEASE_INSTALL} ${FLOPPYBASE}1.fs \
+           ${RELEASEDIR}/installation/floppy/disk1of2
+       ${RELEASE_INSTALL} ${FLOPPYBASE}2.fs \
+           ${RELEASEDIR}/installation/floppy/disk2of2
+
 .include <bsd.prog.mk>
diff -r c9ea993b0271 -r f07714152ac3 distrib/alpha/instkernel/instkernel/Makefile
--- a/distrib/alpha/instkernel/instkernel/Makefile      Thu May 02 18:00:40 2002 +0000
+++ b/distrib/alpha/instkernel/instkernel/Makefile      Thu May 02 18:02:14 2002 +0000
@@ -1,13 +1,13 @@
-#      $NetBSD: Makefile,v 1.23 2002/04/26 15:50:24 lukem Exp $
+#      $NetBSD: Makefile,v 1.24 2002/05/02 18:02:20 lukem Exp $
 
 .include <bsd.own.mk>
-.include "${NETBSDSRCDIR}/distrib/Makefile.inc"
+.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
 
 RAMDISKDIR!=   cd ${.CURDIR}/../ramdisk && ${PRINTOBJDIR}
 RAMDISK=       ${RAMDISKDIR}/ramdisk.fs
-MDSETTARGETS=  INSTALL ${RAMDISK} -
+MDSETTARGETS=  INSTALL ${RAMDISK} netbsd
 
-MDSETDIR=      binary/kernel



Home | Main Index | Thread Index | Old Index