diff options
| author | jkh <jkh@FreeBSD.org> | 1997-07-13 00:54:22 +0000 |
|---|---|---|
| committer | jkh <jkh@FreeBSD.org> | 1997-07-13 00:54:22 +0000 |
| commit | 0bf85b62d46da594bea6cbcf540e01677fde4de4 (patch) | |
| tree | 417b5f21ea295223c3ec52e4c0d54b7a1bc93e6c | |
| parent | 253d097eb2475ed08840482035f3d471edb49116 (diff) | |
| download | FreeBSD-src-0bf85b62d46da594bea6cbcf540e01677fde4de4.zip FreeBSD-src-0bf85b62d46da594bea6cbcf540e01677fde4de4.tar.gz | |
OK, *this* is how the ports stuff should have been built to begin
with. ;-)
| -rw-r--r-- | release/Makefile | 24 |
1 files changed, 7 insertions, 17 deletions
diff --git a/release/Makefile b/release/Makefile index 2b8d215..df61f33 100644 --- a/release/Makefile +++ b/release/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.312 1997/07/02 08:58:58 jkh Exp $ +# $Id: Makefile,v 1.313 1997/07/09 12:45:17 jkh Exp $ # # make release CHROOTDIR=/some/dir BUILDNAME=somename [ RELEASETAG=tag ] # @@ -85,10 +85,7 @@ BOOTSTRAPUTILS+= /usr/bin/cpio CRUNCH_TARGETS= boot fixit .endif -.if !defined(NOPORTS) -EXTRAS+= ports.1 -.endif -EXTRAS+= ftp.1 cdrom.1 +EXTRAS= cdrom.1 ftp.1 .if !defined(NODOC) DOCREL= doc.1 @@ -511,20 +508,13 @@ cdrom.1: cp ${.CURDIR}/sysinstall/help/install.hlp ${CD_DISC1}/INSTALL.TXT cp ${.CURDIR}/sysinstall/help/relnotes.hlp ${CD_DISC1}/RELNOTES.TXT .if !defined(NOPORTS) - ln -s ../ports ${CD_DISC2}/usr/ports -.endif -# -# --==## And finally, create the ports distribution & tarball ##==-- -# -# NOTE: Both ftp.1 and cdrom.1 must be run before this target or it will die -# a quick and gruesome death. We also expect the release engineer to -# manually populate ports/distfiles on the 2nd CDROM. - -ports.1: tar -cBf - -C /usr ports | tar xBpf - -C ${CD_DISC2} && \ - mkdir -p ${CD_DISC1}/ports && tar -czf ${CD_DISC1}/ports/ports.tgz -C /usr ports && \ - cp ${.CURDIR}/scripts/ports-install.sh ${CD_DISC1}/ports/install.sh && \ + mkdir -p ${CD_DISC1}/ports && \ + tar -czf ${CD_DISC1}/ports/ports.tgz -C /usr ports && \ + cp ${.CURDIR}/scripts/ports-install.sh ${CD_DISC1}/ports/install.sh && \ (cd ${CD_DISC1}/ports; md5 * > CHECKSUM.MD5) + ln -s ../ports ${CD_DISC2}/usr/ports +.endif doc.1: cd /usr/doc && make all distribute DISTDIR=${RD}/trees |
