Date: Thu, 4 Feb 1999 13:40:01 -0800 (PST) From: jin@george.lbl.gov To: freebsd-bugs@FreeBSD.ORG Subject: Re: misc/9913: make release would fail for lack of /etc/resolv.conf or $DISTFILES/ Message-ID: <199902042140.NAA03940@freefall.freebsd.org>
index | next in thread | raw e-mail
The following reply was made to PR misc/9913; it has been noted by GNATS.
From: jin@george.lbl.gov
To: FreeBSD-gnats-submit@FreeBSD.ORG, sada@FreeBSD.ORG
Cc:
Subject: Re: misc/9913: make release would fail for lack of /etc/resolv.conf or $DISTFILES/
Date: Thu, 4 Feb 1999 13:25:34 -0800 (PST)
Interesting! The '-' line and '+' lines are exactly same.
What is changed?
----------------- original message ---------------------
>Fix:
Index: Makefile
===================================================================
RCS file: /home/ncvs/src/release/Makefile,v
retrieving revision 1.467
diff -u -r1.467 Makefile
--- Makefile 1999/02/01 18:08:07 1.467
+++ Makefile 1999/02/04 20:20:13
@@ -147,7 +147,9 @@
-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 \
@@ -171,7 +173,9 @@
.endif
.if !defined(NODOC)
cd ${CHROOTDIR}/usr && rm -rf doc && cvs -R -d ${CVSROOT} co -P ${RELEAS
EDOCMODULE}
- [ -d ${DISTFILES}/ ] && cp -rp ${DISTFILES} ${CHROOTDIR}/usr/ports/distf
iles
+ if [ -d ${DISTFILES}/ ]; then \
+ cp -rp ${DISTFILES} ${CHROOTDIR}/usr/ports/distfiles; \
+ fi
.endif
.endif
.if make(rerelease)
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-bugs" in the body of the message
home |
help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199902042140.NAA03940>