diff options
| author | sada <sada@FreeBSD.org> | 1999-03-31 11:18:52 +0000 |
|---|---|---|
| committer | sada <sada@FreeBSD.org> | 1999-03-31 11:18:52 +0000 |
| commit | f9cfb2497d1e4623b9892380f215db324dd245e9 (patch) | |
| tree | 8ec623723f68a6e0437faa8bfb1bdc94e8eb88ff /release/Makefile | |
| parent | 08f9968437a18757aaacf119394e48c98a2f4c21 (diff) | |
| download | FreeBSD-src-f9cfb2497d1e4623b9892380f215db324dd245e9.zip FreeBSD-src-f9cfb2497d1e4623b9892380f215db324dd245e9.tar.gz | |
Make release would fail for lack of /etc/resolv.conf or $DISTFILES/
PR: misc/9913
Submitted by: YAMAMOTO Shigeru <shigeru@bremen.or.jp>
Diffstat (limited to 'release/Makefile')
| -rw-r--r-- | release/Makefile | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/release/Makefile b/release/Makefile index c01a43a..33ce7c5 100644 --- a/release/Makefile +++ b/release/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.474 1999/03/14 20:41:12 markm Exp $ +# $Id: Makefile,v 1.475 1999/03/27 16:02:04 nik Exp $ # # make release CHROOTDIR=/some/dir BUILDNAME=somename [ RELEASETAG=tag ] # @@ -145,7 +145,9 @@ rerelease release: -mkdir -p ${CHROOTDIR} cd ${.CURDIR}/../etc && ${MAKE} distrib-dirs DESTDIR=${CHROOTDIR} cd ${.CURDIR}/../etc && ${MAKE} distribution DESTDIR=${CHROOTDIR} - [ -f /etc/resolv.conf ] && cp -p /etc/resolv.conf ${CHROOTDIR}/etc + if [ -f /etc/resolv.conf ]; then \ + cp -p /etc/resolv.conf ${CHROOTDIR}/etc; \ + fi cd ${.CURDIR}/.. && ${MAKE} installworld DESTDIR=${CHROOTDIR} NOMAN=1 mkdir ${CHROOTDIR}/${BOOTSTRAPDIR} for i in ${BOOTSTRAPUTILS} ; do \ @@ -169,7 +171,9 @@ rerelease release: .endif .if !defined(NODOC) cd ${CHROOTDIR}/usr && rm -rf doc && cvs -R -d ${CVSROOT} co -P ${RELEASEDOCMODULE} - [ -d ${DISTFILES}/ ] && cp -rp ${DISTFILES} ${CHROOTDIR}/usr/ports/distfiles + if [ -d ${DISTFILES}/ ]; then \ + cp -rp ${DISTFILES} ${CHROOTDIR}/usr/ports/distfiles; \ + fi .endif .endif .if make(rerelease) |
