diff options
| author | jkh <jkh@FreeBSD.org> | 1999-09-16 08:44:22 +0000 |
|---|---|---|
| committer | jkh <jkh@FreeBSD.org> | 1999-09-16 08:44:22 +0000 |
| commit | 190e4bc3edde59ddaccc65baf316b87d995c12e9 (patch) | |
| tree | 09f56c42469f6c3e0a5a007f7d9d2883c7a2cade /release | |
| parent | 4e25c183b590c314cf2ac9917980b5197ef69ae8 (diff) | |
| download | FreeBSD-src-190e4bc3edde59ddaccc65baf316b87d995c12e9.zip FreeBSD-src-190e4bc3edde59ddaccc65baf316b87d995c12e9.tar.gz | |
Some minor cosmetics: make mkdir less chatty in the output and stop making /R
magic.
Diffstat (limited to 'release')
| -rw-r--r-- | release/Makefile | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/release/Makefile b/release/Makefile index 5d74d66..1e6c18f 100644 --- a/release/Makefile +++ b/release/Makefile @@ -107,9 +107,10 @@ VNDEVICE?= vn0 # Things which may get you into trouble if you change them MTREEFILES= ${.CURDIR}/../etc/mtree -RD= /R/stage -FD= /R/ftp -CD= /R/cdrom +_R= /R +RD= ${_R}/stage +FD= ${_R}/ftp +CD= ${_R}/cdrom CD_DISC1= ${CD}/disc1 CD_DISC2= ${CD}/disc2 @@ -158,7 +159,7 @@ rerelease release: -chflags -R noschg ${CHROOTDIR}/. -rm -rf ${CHROOTDIR} .endif - -mkdir -p ${CHROOTDIR} + mkdir -p ${CHROOTDIR} cd ${.CURDIR}/../etc && ${MAKE} distrib-dirs DESTDIR=${CHROOTDIR} cd ${.CURDIR}/../etc && ${MAKE} distribution DESTDIR=${CHROOTDIR} if [ -f /etc/resolv.conf ]; then \ @@ -245,7 +246,7 @@ rerelease release: echo "export BOOT_CONFIG=\"${BOOT_CONFIG}\"">> ${CHROOTDIR}/mk .endif # Don't remove this, or the build will fall over! - echo "export RELEASEDIR=/R" >> ${CHROOTDIR}/mk + echo "export RELEASEDIR=${_R}" >> ${CHROOTDIR}/mk echo "export PATH=${BOOTSTRAPDIR}:$${PATH}:${LOCALDIR}" >> ${CHROOTDIR}/mk echo "if [ ! -f /tmp/.world_done ]; then" >> ${CHROOTDIR}/mk echo " cd /usr/src" >> ${CHROOTDIR}/mk @@ -269,11 +270,11 @@ rerelease release: clean: rm -rf boot_crunch ${.OBJDIR}/boot_crunch.conf release.[0-9] -# Clean out /R and make the directory structure. +# Clean out ${_R} and make the directory structure. release.1: - -mkdir /R - -chflags -R noschg /R/. - rm -rf /R/* + mkdir -p ${_R} + -chflags -R noschg ${_R}/. + rm -rf ${_R}/* mkdir ${RD} mkdir ${RD}/floppies .if ${MACHINE_ARCH} == "i386" |
