summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorlukem <lukem@NetBSD.org>2008-03-18 04:20:36 +0000
committerlukem <lukem@NetBSD.org>2008-03-18 04:20:36 +0000
commit2c1c2b60b2e45dcda990dcdec9b7c96819ff5c25 (patch)
tree7652eaf2a0d42ac5aff45f0cd106d88976c7e488 /etc
parent5e0e0b0a5929e4cb83b7fe7f052a29d08b3a8883 (diff)
Convert all the etc/etc.*/Makefile.inc to use RELEASEDIR/RELEASEMACHINEDIR
just like etc/Makefile does.
Diffstat (limited to 'etc')
-rw-r--r--etc/etc.acorn26/Makefile.inc6
-rw-r--r--etc/etc.acorn32/Makefile.inc8
-rw-r--r--etc/etc.amd64/Makefile.inc8
-rw-r--r--etc/etc.amiga/Makefile.inc6
-rw-r--r--etc/etc.amigappc/Makefile.inc6
-rw-r--r--etc/etc.atari/Makefile.inc4
-rw-r--r--etc/etc.cats/Makefile.inc6
-rw-r--r--etc/etc.ews4800mips/Makefile.inc8
-rw-r--r--etc/etc.hp300/Makefile.inc6
-rw-r--r--etc/etc.i386/Makefile.inc8
-rw-r--r--etc/etc.mac68k/Makefile.inc6
-rw-r--r--etc/etc.mvme68k/Makefile.inc10
-rw-r--r--etc/etc.netwinder/Makefile.inc6
-rw-r--r--etc/etc.news68k/Makefile.inc4
-rw-r--r--etc/etc.newsmips/Makefile.inc4
-rw-r--r--etc/etc.next68k/Makefile.inc4
-rw-r--r--etc/etc.prep/Makefile.inc4
-rw-r--r--etc/etc.sgimips/Makefile.inc8
-rw-r--r--etc/etc.shark/Makefile.inc4
-rw-r--r--etc/etc.sparc/Makefile.inc12
-rw-r--r--etc/etc.sparc64/Makefile.inc10
-rw-r--r--etc/etc.vax/Makefile.inc4
-rw-r--r--etc/etc.x68k/Makefile.inc4
23 files changed, 73 insertions, 73 deletions
diff --git a/etc/etc.acorn26/Makefile.inc b/etc/etc.acorn26/Makefile.inc
index 504db5b0bec..3b614338ca4 100644
--- a/etc/etc.acorn26/Makefile.inc
+++ b/etc/etc.acorn26/Makefile.inc
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.9 2007/07/24 10:49:23 pavel Exp $
+# $NetBSD: Makefile.inc,v 1.10 2008/03/18 04:20:36 lukem Exp $
#
# etc.acorn26/Makefile.inc -- acorn26-specific etc Makefile targets
#
@@ -15,7 +15,7 @@ INSTALLATION_DIRS+= installation/misc
snap_md_post:
# install bootloader into installation directory
${HOST_INSTALL_FILE} -m ${NONBINMODE} ${DESTDIR}/usr/mdec/boot26,ffa \
- ${RELEASEDIR}/${MACHINE}/installation/misc
+ ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/misc
# compute checksums
- ${MAKESUMS} -t ${RELEASEDIR}/${MACHINE}/installation/misc 'boot26,ffa'
+ ${MAKESUMS} -t ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/misc 'boot26,ffa'
diff --git a/etc/etc.acorn32/Makefile.inc b/etc/etc.acorn32/Makefile.inc
index 9bb103859de..2dde6dd5774 100644
--- a/etc/etc.acorn32/Makefile.inc
+++ b/etc/etc.acorn32/Makefile.inc
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.12 2007/07/24 10:49:23 pavel Exp $
+# $NetBSD: Makefile.inc,v 1.13 2008/03/18 04:20:36 lukem Exp $
#
# etc.acorn32/Makefile.inc -- acorn32-specific etc Makefile targets
#
@@ -15,6 +15,6 @@ INSTALLATION_DIRS+= installation/kernel \
snap_md_post:
${HOST_INSTALL_FILE} -m ${NONBINMODE} ${DESTDIR}/usr/mdec/boot32,ffa \
- ${RELEASEDIR}/${MACHINE}/installation/misc
- ${MAKESUMS} -t ${RELEASEDIR}/${MACHINE}/installation/kernel '*.gz'
- ${MAKESUMS} -t ${RELEASEDIR}/${MACHINE}/installation/misc '*.gz' boot32,ffa
+ ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/misc
+ ${MAKESUMS} -t ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/kernel '*.gz'
+ ${MAKESUMS} -t ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/misc '*.gz' boot32,ffa
diff --git a/etc/etc.amd64/Makefile.inc b/etc/etc.amd64/Makefile.inc
index 8138f647499..235ebbd37ab 100644
--- a/etc/etc.amd64/Makefile.inc
+++ b/etc/etc.amd64/Makefile.inc
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.10 2007/12/20 23:32:24 ad Exp $
+# $NetBSD: Makefile.inc,v 1.11 2008/03/18 04:20:36 lukem Exp $
#
# etc.amd64/Makefile.inc -- amd64-specific etc Makefile targets
#
@@ -17,6 +17,6 @@ INSTALLATION_DIRS+= installation/misc
snap_md_post:
cd ${KERNSRCDIR}/arch/i386/stand/pxeboot && ${MAKE} release
- ${MAKESUMS} -t ${RELEASEDIR}/${MACHINE}/installation/cdrom '*.iso'
- ${MAKESUMS} -t ${RELEASEDIR}/${MACHINE}/installation/floppy '*.fs'
- ${MAKESUMS} -t ${RELEASEDIR}/${MACHINE}/installation/misc '*.*'
+ ${MAKESUMS} -t ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/cdrom '*.iso'
+ ${MAKESUMS} -t ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/floppy '*.fs'
+ ${MAKESUMS} -t ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/misc '*.*'
diff --git a/etc/etc.amiga/Makefile.inc b/etc/etc.amiga/Makefile.inc
index d2c28f50127..703da0e8921 100644
--- a/etc/etc.amiga/Makefile.inc
+++ b/etc/etc.amiga/Makefile.inc
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.25 2007/07/24 10:49:24 pavel Exp $
+# $NetBSD: Makefile.inc,v 1.26 2008/03/18 04:20:36 lukem Exp $
#
# etc.amiga/Makefile.inc -- amiga-specific etc Makefile targets
#
@@ -14,5 +14,5 @@ INSTALLATION_DIRS+= installation/miniroot \
installation/misc
snap_md_post:
- ${MAKESUMS} -t ${RELEASEDIR}/${MACHINE}/installation/misc '*'
-# ${MAKESUMS} -t ${RELEASEDIR}/${MACHINE}/installation/miniroot '*.gz'
+ ${MAKESUMS} -t ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/misc '*'
+# ${MAKESUMS} -t ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/miniroot '*.gz'
diff --git a/etc/etc.amigappc/Makefile.inc b/etc/etc.amigappc/Makefile.inc
index 22200f94d88..2e9371c758d 100644
--- a/etc/etc.amigappc/Makefile.inc
+++ b/etc/etc.amigappc/Makefile.inc
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.3 2007/07/24 10:49:24 pavel Exp $
+# $NetBSD: Makefile.inc,v 1.4 2008/03/18 04:20:36 lukem Exp $
#
# etc.amiga/Makefile.inc -- amiga-specific etc Makefile targets
#
@@ -14,5 +14,5 @@ INSTALLATION_DIRS+= installation/miniroot \
installation/misc
snap_md_post:
- ${MAKESUMS} -t ${RELEASEDIR}/${MACHINE}/installation/misc '*'
-# ${MAKESUMS} -t ${RELEASEDIR}/${MACHINE}/installation/miniroot '*.gz'
+ ${MAKESUMS} -t ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/misc '*'
+# ${MAKESUMS} -t ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/miniroot '*.gz'
diff --git a/etc/etc.atari/Makefile.inc b/etc/etc.atari/Makefile.inc
index 2054b413be3..d97388266a4 100644
--- a/etc/etc.atari/Makefile.inc
+++ b/etc/etc.atari/Makefile.inc
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.16 2007/07/24 10:49:24 pavel Exp $
+# $NetBSD: Makefile.inc,v 1.17 2008/03/18 04:20:36 lukem Exp $
#
# etc.atari/Makefile.inc -- atari-specific etc Makefile targets
#
@@ -14,4 +14,4 @@ INSTALLATION_DIRS+= installation/miniroot \
installation/misc
snap_md_post:
-# ${MAKESUMS} -t ${RELEASEDIR}/${MACHINE}/installation/miniroot '*.gz'
+# ${MAKESUMS} -t ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/miniroot '*.gz'
diff --git a/etc/etc.cats/Makefile.inc b/etc/etc.cats/Makefile.inc
index cdc339dbfa7..6f509111949 100644
--- a/etc/etc.cats/Makefile.inc
+++ b/etc/etc.cats/Makefile.inc
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.15 2007/07/24 10:49:24 pavel Exp $
+# $NetBSD: Makefile.inc,v 1.16 2008/03/18 04:20:37 lukem Exp $
#
# etc.cats/Makefile.inc -- cats-specific etc Makefile targets
#
@@ -14,8 +14,8 @@ BUILD_KERNELS= INSTALL INSTALL.ABLE
INSTALLATION_DIRS+= installation/kernel
snap_md_post:
- ${MAKESUMS} -t ${RELEASEDIR}/${MACHINE}/installation/kernel '*.gz'
+ ${MAKESUMS} -t ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/kernel '*.gz'
iso-image-md-pre:
- gzip -dc ${RELEASEDIR}/${MACHINE}/binary/kernel/netbsd.aout-INSTALL.gz \
+ gzip -dc ${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/kernel/netbsd.aout-INSTALL.gz \
> ${CDROM.dir}/netbsd
diff --git a/etc/etc.ews4800mips/Makefile.inc b/etc/etc.ews4800mips/Makefile.inc
index 1a278320862..aaadbcd815a 100644
--- a/etc/etc.ews4800mips/Makefile.inc
+++ b/etc/etc.ews4800mips/Makefile.inc
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.3 2007/07/24 10:49:25 pavel Exp $
+# $NetBSD: Makefile.inc,v 1.4 2008/03/18 04:20:37 lukem Exp $
#
# etc.ews4800mips/Makefile.inc --
# ews4800mips-specific etc Makefile targets
@@ -18,11 +18,11 @@ INSTALLATION_DIRS+= ${MD_INSTALLATION_DIRS}
snap_md_post:
# install bootloader binaries in boot directory
${HOST_INSTALL_FILE} -m ${NONBINMODE} ${DESTDIR}/usr/mdec/boot \
- ${RELEASEDIR}/${MACHINE}/installation/boot
+ ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/boot
${HOST_INSTALL_FILE} -m ${NONBINMODE} ${DESTDIR}/usr/mdec/boot.coff \
- ${RELEASEDIR}/${MACHINE}/installation/boot
+ ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/boot
# compute checksums
.for dir in ${MD_INSTALLATION_DIRS}
- ${MAKESUMS} -t ${RELEASEDIR}/${MACHINE}/${dir} '*'
+ ${MAKESUMS} -t ${RELEASEDIR}/${RELEASEMACHINEDIR}/${dir} '*'
.endfor
diff --git a/etc/etc.hp300/Makefile.inc b/etc/etc.hp300/Makefile.inc
index e8dbea8318e..5887522c40b 100644
--- a/etc/etc.hp300/Makefile.inc
+++ b/etc/etc.hp300/Makefile.inc
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.20 2007/07/24 10:49:25 pavel Exp $
+# $NetBSD: Makefile.inc,v 1.21 2008/03/18 04:20:37 lukem Exp $
#
# etc.hp300/Makefile.inc -- hp300-specific etc Makefile targets
#
@@ -19,5 +19,5 @@ snap_md_post:
.endif
cd ${KERNSRCDIR}/arch/hp300/stand && \
${MAKE} depend && ${MAKE} && ${MAKE} release
- ${MAKESUMS} -t ${RELEASEDIR}/${MACHINE}/installation/miniroot '*.fs*'
- ${MAKESUMS} -t ${RELEASEDIR}/${MACHINE}/installation/misc 'SYS*'
+ ${MAKESUMS} -t ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/miniroot '*.fs*'
+ ${MAKESUMS} -t ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/misc 'SYS*'
diff --git a/etc/etc.i386/Makefile.inc b/etc/etc.i386/Makefile.inc
index 984afc88f44..3053b436438 100644
--- a/etc/etc.i386/Makefile.inc
+++ b/etc/etc.i386/Makefile.inc
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.55 2008/01/23 19:52:24 bouyer Exp $
+# $NetBSD: Makefile.inc,v 1.56 2008/03/18 04:20:37 lukem Exp $
#
# etc.i386/Makefile.inc -- i386-specific etc Makefile targets
#
@@ -35,6 +35,6 @@ snap_md_post:
cd ${KERNSRCDIR}/arch/i386/stand/dosboot && ${MAKE} release
cd ${KERNSRCDIR}/arch/i386/stand/pxeboot && ${MAKE} release
cd ${KERNSRCDIR}/arch/i386/stand/misc && ${MAKE} release
- ${MAKESUMS} -t ${RELEASEDIR}/${MACHINE}/installation/cdrom '*.iso'
- ${MAKESUMS} -t ${RELEASEDIR}/${MACHINE}/installation/floppy '*.fs'
- ${MAKESUMS} -t ${RELEASEDIR}/${MACHINE}/installation/misc '*.*'
+ ${MAKESUMS} -t ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/cdrom '*.iso'
+ ${MAKESUMS} -t ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/floppy '*.fs'
+ ${MAKESUMS} -t ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/misc '*.*'
diff --git a/etc/etc.mac68k/Makefile.inc b/etc/etc.mac68k/Makefile.inc
index 272ea5363da..e5facc14ffc 100644
--- a/etc/etc.mac68k/Makefile.inc
+++ b/etc/etc.mac68k/Makefile.inc
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.19 2007/07/24 10:49:26 pavel Exp $
+# $NetBSD: Makefile.inc,v 1.20 2008/03/18 04:20:37 lukem Exp $
#
# etc.mac68k/Makefile.inc -- mac68k-specific etc Makefile targets
#
@@ -14,11 +14,11 @@ INSTALLATION_DIRS+= installation/miniroot \
installation/instkernel
snap_md_post:
- ${MAKESUMS} -t ${RELEASEDIR}/${MACHINE}/installation/instkernel '*.gz'
+ ${MAKESUMS} -t ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/instkernel '*.gz'
# For "make iso-image"
# mkisofs arguments to create a hybrid (HFS/Rockridge) CD-ROM image.
MKISOFS_FLAGS+= -hfs --macbin \
- -map ${RELEASEDIR}/${MACHINE}/installation/misc/extensions.map
+ -map ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/misc/extensions.map
iso-image: do-iso-image
diff --git a/etc/etc.mvme68k/Makefile.inc b/etc/etc.mvme68k/Makefile.inc
index 7bea486c39e..4b848ca1769 100644
--- a/etc/etc.mvme68k/Makefile.inc
+++ b/etc/etc.mvme68k/Makefile.inc
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.9 2007/07/24 10:49:26 pavel Exp $
+# $NetBSD: Makefile.inc,v 1.10 2008/03/18 04:20:37 lukem Exp $
#
# etc.mvme68k/Makefile.inc -- mvme68k-specific etc Makefile targets
#
@@ -17,12 +17,12 @@ INSTALLATION_DIRS+= installation/miniroot \
snap_md_post:
.for file in netboot sboot
${HOST_INSTALL_FILE} -m ${NONBINMODE} ${DESTDIR}/usr/mdec/${file} \
- ${RELEASEDIR}/${MACHINE}/installation/netboot
+ ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/netboot
.endfor
.for file in bootst stboot
${HOST_INSTALL_FILE} -m ${NONBINMODE} ${DESTDIR}/usr/mdec/${file} \
- ${RELEASEDIR}/${MACHINE}/installation/tapeimage
+ ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/tapeimage
.endfor
- ${MAKESUMS} -t ${RELEASEDIR}/${MACHINE}/installation/netboot -a
- ${MAKESUMS} -t ${RELEASEDIR}/${MACHINE}/installation/tapeimage -a
+ ${MAKESUMS} -t ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/netboot -a
+ ${MAKESUMS} -t ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/tapeimage -a
diff --git a/etc/etc.netwinder/Makefile.inc b/etc/etc.netwinder/Makefile.inc
index e68573b0114..a27c04db291 100644
--- a/etc/etc.netwinder/Makefile.inc
+++ b/etc/etc.netwinder/Makefile.inc
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.8 2007/07/24 10:49:26 pavel Exp $
+# $NetBSD: Makefile.inc,v 1.9 2008/03/18 04:20:37 lukem Exp $
#
# etc.netwinder/Makefile.inc -- netwinder-specific etc Makefile targets
#
@@ -15,5 +15,5 @@ KERNEL_SETS= GENERIC
# Build the release notes and boot floppies and install them
snap_md_post:
-# ${MAKESUMS} -t ${RELEASEDIR}/${MACHINE}/installation/kernel '*.gz'
-# ${MAKESUMS} -t ${RELEASEDIR}/${MACHINE}/installation/misc '*.gz'
+# ${MAKESUMS} -t ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/kernel '*.gz'
+# ${MAKESUMS} -t ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/misc '*.gz'
diff --git a/etc/etc.news68k/Makefile.inc b/etc/etc.news68k/Makefile.inc
index 8b8036c424c..55bd931b55b 100644
--- a/etc/etc.news68k/Makefile.inc
+++ b/etc/etc.news68k/Makefile.inc
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.8 2007/07/24 10:49:26 pavel Exp $
+# $NetBSD: Makefile.inc,v 1.9 2008/03/18 04:20:37 lukem Exp $
#
# etc.news68k/Makefile.inc -- news68k-specific etc Makefile targets
#
@@ -13,4 +13,4 @@ BUILD_KERNELS= INSTALL
INSTALLATION_DIRS+= installation/floppy
snap_md_post:
- ${MAKESUMS} -t ${RELEASEDIR}/${MACHINE}/installation/floppy '*.fs'
+ ${MAKESUMS} -t ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/floppy '*.fs'
diff --git a/etc/etc.newsmips/Makefile.inc b/etc/etc.newsmips/Makefile.inc
index 13e4ccea5cb..404e4829783 100644
--- a/etc/etc.newsmips/Makefile.inc
+++ b/etc/etc.newsmips/Makefile.inc
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.6 2007/07/24 10:49:27 pavel Exp $
+# $NetBSD: Makefile.inc,v 1.7 2008/03/18 04:20:37 lukem Exp $
#
# etc.newsmips/Makefile.inc -- newsmips-specific etc Makefile targets
#
@@ -13,4 +13,4 @@ BUILD_KERNELS= INSTALL
INSTALLATION_DIRS+= installation/floppy
snap_md_post:
- ${MAKESUMS} -t ${RELEASEDIR}/${MACHINE}/installation/floppy '*.fs'
+ ${MAKESUMS} -t ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/floppy '*.fs'
diff --git a/etc/etc.next68k/Makefile.inc b/etc/etc.next68k/Makefile.inc
index 5ba3efe2d13..eb2be27e362 100644
--- a/etc/etc.next68k/Makefile.inc
+++ b/etc/etc.next68k/Makefile.inc
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.6 2007/07/24 10:49:27 pavel Exp $
+# $NetBSD: Makefile.inc,v 1.7 2008/03/18 04:20:37 lukem Exp $
#
# etc.next68k/Makefile.inc -- next68k-specific etc Makefile targets
#
@@ -11,4 +11,4 @@ KERNEL_SETS= GENERIC
snap_md_post:
# install boot image in installation directory
${HOST_INSTALL_FILE} -m ${NONBINMODE} ${DESTDIR}/usr/mdec/boot \
- ${RELEASEDIR}/${MACHINE}/installation/boot
+ ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/boot
diff --git a/etc/etc.prep/Makefile.inc b/etc/etc.prep/Makefile.inc
index 9e5b65c6c56..fae52f39f53 100644
--- a/etc/etc.prep/Makefile.inc
+++ b/etc/etc.prep/Makefile.inc
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.8 2007/07/24 10:49:27 pavel Exp $
+# $NetBSD: Makefile.inc,v 1.9 2008/03/18 04:20:37 lukem Exp $
#
# etc.prep/Makefile.inc -- prep-specific etc Makefile targets
#
@@ -16,4 +16,4 @@ INSTALLATION_DIRS+= installation/floppy
MKISOFS_FLAGS+= -prep-boot installation/floppy/sysinst.fs
snap_md_post:
- ${MAKESUMS} -t ${RELEASEDIR}/${MACHINE}/installation/floppy '*'
+ ${MAKESUMS} -t ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/floppy '*'
diff --git a/etc/etc.sgimips/Makefile.inc b/etc/etc.sgimips/Makefile.inc
index ba5f481b930..d2013361bc6 100644
--- a/etc/etc.sgimips/Makefile.inc
+++ b/etc/etc.sgimips/Makefile.inc
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.16 2007/07/24 10:49:28 pavel Exp $
+# $NetBSD: Makefile.inc,v 1.17 2008/03/18 04:20:37 lukem Exp $
#
# etc.sgimips/Makefile.inc -- sgimips-specific etc Makefile targets
#
@@ -17,12 +17,12 @@ INSTALLATION_DIRS+= installation/netboot \
installation/diskimage
iso-image-md-pre:
- cp ${RELEASEDIR}/${MACHINE}/binary/kernel/netbsd-INSTALL32_IP2x.gz ${RELEASEDIR}/ip2x
- cp ${RELEASEDIR}/${MACHINE}/binary/kernel/netbsd-INSTALL32_IP3x.gz ${RELEASEDIR}/ip3x
+ cp ${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/kernel/netbsd-INSTALL32_IP2x.gz ${RELEASEDIR}/ip2x
+ cp ${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/kernel/netbsd-INSTALL32_IP3x.gz ${RELEASEDIR}/ip3x
echo "ip2x/=${RELEASEDIR}/ip2x/" >> ${CDROM.pathlist}
echo "ip3x/=${RELEASEDIR}/ip3x/" >> ${CDROM.pathlist}
-SGI.image= ${RELEASEDIR}/${MACHINE}/installation/cdrom/netbsd-sgimips.img
+SGI.image= ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/cdrom/netbsd-sgimips.img
iso-image-md-post:
@SEEK=`awk '/SGI_BOOT_BLOCK_SIZE_VOLHDR/{print $$3}' \
diff --git a/etc/etc.shark/Makefile.inc b/etc/etc.shark/Makefile.inc
index 3122778559c..7497ccd595f 100644
--- a/etc/etc.shark/Makefile.inc
+++ b/etc/etc.shark/Makefile.inc
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.9 2007/07/24 10:49:28 pavel Exp $
+# $NetBSD: Makefile.inc,v 1.10 2008/03/18 04:20:37 lukem Exp $
#
# etc.shark/Makefile.inc -- shark-specific etc Makefile targets
#
@@ -16,4 +16,4 @@ INSTALLATION_DIRS+= installation/instkernel
snap_md_post:
cd ${NETBSDSRCDIR}/distrib/shark/instkernel/instkernel && \
${MAKE} release-aout-instkernel
- ${MAKESUMS} -t ${RELEASEDIR}/${MACHINE}/installation/instkernel '*.gz'
+ ${MAKESUMS} -t ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/instkernel '*.gz'
diff --git a/etc/etc.sparc/Makefile.inc b/etc/etc.sparc/Makefile.inc
index 60a4360d887..d4bce362261 100644
--- a/etc/etc.sparc/Makefile.inc
+++ b/etc/etc.sparc/Makefile.inc
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.40 2007/07/24 10:49:28 pavel Exp $
+# $NetBSD: Makefile.inc,v 1.41 2008/03/18 04:20:37 lukem Exp $
#
# etc.sparc/Makefile.inc -- sparc-specific etc Makefile targets
#
@@ -32,19 +32,19 @@ INSTALLATION_SYMLINKS= \
snap_md_post:
# install boot images in netboot directory
${HOST_INSTALL_FILE} -m ${NONBINMODE} ${DESTDIR}/usr/mdec/boot.net \
- ${RELEASEDIR}/${MACHINE}/installation/netboot
+ ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/netboot
${HOST_INSTALL_FILE} -m ${NONBINMODE} ${DESTDIR}/usr/mdec/bootjs.net \
- ${RELEASEDIR}/${MACHINE}/installation/netboot
+ ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/netboot
# install links to boot and installation utilities for various media
.for linkdst linksrc in ${INSTALLATION_SYMLINKS}
- rm -f ${RELEASEDIR}/${MACHINE}/installation/${linkdst}
- ln -s ${linksrc} ${RELEASEDIR}/${MACHINE}/installation/${linkdst}
+ rm -f ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/${linkdst}
+ ln -s ${linksrc} ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/${linkdst}
.endfor
# compute checksums
.for dir in ${MD_INSTALLATION_DIRS}
- ${MAKESUMS} -t ${RELEASEDIR}/${MACHINE}/${dir} '*'
+ ${MAKESUMS} -t ${RELEASEDIR}/${RELEASEMACHINEDIR}/${dir} '*'
.endfor
CDBOOTIMAGEDIR!= cd ${NETBSDSRCDIR}/distrib/sparc/bootfs && ${PRINTOBJDIR}
diff --git a/etc/etc.sparc64/Makefile.inc b/etc/etc.sparc64/Makefile.inc
index dc13eb48d92..e24703f53bc 100644
--- a/etc/etc.sparc64/Makefile.inc
+++ b/etc/etc.sparc64/Makefile.inc
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.28 2008/03/14 16:43:16 nakayama Exp $
+# $NetBSD: Makefile.inc,v 1.29 2008/03/18 04:20:37 lukem Exp $
#
# etc.sparc64/Makefile.inc -- sparc64-specific etc Makefile targets
#
@@ -58,20 +58,20 @@ snap_md_post:
# install boot image and installation scripts in netboot directory
.for file in ofwboot.net
${HOST_INSTALL_FILE} -m ${NONBINMODE} ${DESTDIR}/usr/mdec/${file} \
- ${RELEASEDIR}/${MACHINE}/installation/netboot
+ ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/netboot
.endfor
.for file in ofwboot bootblk
${HOST_INSTALL_FILE} -m ${NONBINMODE} ${DESTDIR}/usr/mdec/${file} \
- ${RELEASEDIR}/${MACHINE}/installation/misc
+ ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/misc
.endfor
.for file in installboot
${HOST_INSTALL_FILE} -m ${BINMODE} ${DESTDIR}/usr/sbin/${file} \
- ${RELEASEDIR}/${MACHINE}/installation/misc
+ ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/misc
.endfor
# compute checksums
.for dir in ${MD_INSTALLATION_DIRS}
- ${MAKESUMS} -t ${RELEASEDIR}/${MACHINE}/${dir} '*'
+ ${MAKESUMS} -t ${RELEASEDIR}/${RELEASEMACHINEDIR}/${dir} '*'
.endfor
ISOBOOTFILEDIR!=cd ${.CURDIR}/../distrib/${MACHINE}/bootfs && ${PRINTOBJDIR}
diff --git a/etc/etc.vax/Makefile.inc b/etc/etc.vax/Makefile.inc
index 669718b747c..4153f3c7d11 100644
--- a/etc/etc.vax/Makefile.inc
+++ b/etc/etc.vax/Makefile.inc
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.22 2007/07/24 10:49:28 pavel Exp $
+# $NetBSD: Makefile.inc,v 1.23 2008/03/18 04:20:37 lukem Exp $
#
# etc.vax/Makefile.inc -- vax-specific etc Makefile targets
#
@@ -15,7 +15,7 @@ INSTALLATION_DIRS+= installation/bootfs \
installation/netboot
iso-image-md-pre:
- cp -f ${RELEASEDIR}/${MACHINE}/installation/netboot/install.ram.gz \
+ cp -f ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/netboot/install.ram.gz \
${CDROM.dir}/netbsd
cp -f ${DESTDIR}/usr/mdec/boot ${CDROM.dir}
diff --git a/etc/etc.x68k/Makefile.inc b/etc/etc.x68k/Makefile.inc
index cb82acced81..340bb408e01 100644
--- a/etc/etc.x68k/Makefile.inc
+++ b/etc/etc.x68k/Makefile.inc
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.18 2007/07/24 10:49:28 pavel Exp $
+# $NetBSD: Makefile.inc,v 1.19 2008/03/18 04:20:37 lukem Exp $
#
# etc.x68k/Makefile.inc -- x68k-specific etc Makefile targets
#
@@ -17,4 +17,4 @@ LOCALTIME= Japan
snap_md_post:
cd ${KERNSRCDIR}/arch/x68k/stand/loadbsd && ${MAKE} release
- ${MAKESUMS} -t ${RELEASEDIR}/${MACHINE}/installation/floppy '*.gz'
+ ${MAKESUMS} -t ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/floppy '*.gz'