Make release would fail for lack of /etc/resolv.conf or $DISTFILES/

PR:	misc/9913
Submitted by:	YAMAMOTO Shigeru <shigeru@bremen.or.jp>
This commit is contained in:
SADA Kenji 1999-03-31 11:18:52 +00:00
parent 4bd1924ddf
commit 8e8d540f0d

View File

@ -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)