aboutsummaryrefslogtreecommitdiff
path: root/release/Makefile
diff options
context:
space:
mode:
authorRuslan Ermilov <ru@FreeBSD.org>2003-04-23 09:01:35 +0000
committerRuslan Ermilov <ru@FreeBSD.org>2003-04-23 09:01:35 +0000
commitc9030dc84df034ad2137dcc55b6ddef26811a500 (patch)
tree0f2895d8362521000b9aca2a72af4108166aa923 /release/Makefile
parentaf16b40ba977ae2b65ea3cd2005e6d1dde82ce51 (diff)
downloadsrc-c9030dc84df034ad2137dcc55b6ddef26811a500.tar.gz
src-c9030dc84df034ad2137dcc55b6ddef26811a500.zip
Presumably fix sparc64 "make release". (The breakage was due to
sunlabel(8) no longer being linked to disklabel(8).) Reviewed by: phk
Notes
Notes: svn path=/head/; revision=113899
Diffstat (limited to 'release/Makefile')
-rw-r--r--release/Makefile12
1 files changed, 7 insertions, 5 deletions
diff --git a/release/Makefile b/release/Makefile
index 3d43d8bc3433..82598f68f27f 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -200,6 +200,7 @@ FIXITLABEL= minimum2
MFSLABEL= auto
BIGBOOTLABEL= minimum2
.elif ${TARGET_ARCH} == "sparc64"
+DISKLABEL= sunlabel
BIGBOOTSIZE= 4096
MFSSIZE= 4096
BOOTINODE= 8192
@@ -215,6 +216,8 @@ MFSLABEL= auto
MFSSIZE= 8192
.endif
+DISKLABEL?= disklabel
+
ZIPNSPLIT= gzip --no-name -9 -c | split -b 1423k -
# Things that need to be recompiled with Kerberos support.
@@ -245,13 +248,12 @@ CD_DISC2= ${CD}/disc2
# Where the bootstrap ports (see DOCPORTS) get installed.
LOCALDIR= /usr/local/bin
-# ia64 is different enough that we want our own doFS.sh.
-.if ${TARGET_ARCH} == "ia64"
-DOFS_SH= ${.CURDIR}/ia64/doFS.sh
+.if exists(${.CURDIR}/${TARGET_ARCH}/doFS.sh)
+DOFS_SH= ${.CURDIR}/${TARGET_ARCH}/doFS.sh
.elif ${TARGET} != ${MACHINE}
-DOFS_SH= ${.CURDIR}/scripts/doFS.sh ${TARGET}
+DOFS_SH= ${.CURDIR}/scripts/doFS.sh ${DISKLABEL} ${TARGET}
.else
-DOFS_SH= ${.CURDIR}/scripts/doFS.sh ""
+DOFS_SH= ${.CURDIR}/scripts/doFS.sh ${DISKLABEL} ""
.endif
.if ${TARGET_ARCH} == "sparc64"