summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDag-Erling Smørgrav <des@FreeBSD.org>1999-02-14 14:09:44 +0000
committerDag-Erling Smørgrav <des@FreeBSD.org>1999-02-14 14:09:44 +0000
commit68b4d8c1a2d6e51ba50cd4522e76ba17ba26abe6 (patch)
treeb889ef30976efef43c6139ac073210c83246472e
parent1e9b06deb907ab8f5746ecc040b5a5c8ef11132c (diff)
Notes
-rw-r--r--Makefile.inc14
-rw-r--r--release/Makefile4
-rw-r--r--sys/alpha/conf/Makefile.alpha4
-rw-r--r--sys/i386/conf/Makefile.i3864
-rw-r--r--sys/pc98/conf/Makefile.pc984
-rw-r--r--usr.bin/chpass/Makefile4
-rw-r--r--usr.bin/passwd/Makefile6
7 files changed, 15 insertions, 15 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1
index cbc0c3cd5e5e..c857eca33829 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -1,5 +1,5 @@
#
-# $Id: Makefile.inc1,v 1.59 1999/01/20 05:45:57 markm Exp $
+# $Id: Makefile.inc1,v 1.59.2.1 1999/02/02 03:12:57 jkh Exp $
#
# Make command line options:
# -DCLOBBER will remove /usr/include
@@ -226,7 +226,7 @@ buildworld: check-objformat
@echo ">>> Cleaning up the temporary ${OBJFORMAT} build tree"
@echo "--------------------------------------------------------------"
mkdir -p ${WORLDTMP}
- chflags -R noschg ${WORLDTMP}/
+ -chflags -R noschg ${WORLDTMP}/
rm -rf ${WORLDTMP}
.endif
.if !defined(NOTOOLS)
diff --git a/release/Makefile b/release/Makefile
index 16995233573d..9bed84d1ebd5 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.460.2.6 1999/02/10 09:15:41 jkh Exp $
+# $Id: Makefile,v 1.460.2.7 1999/02/10 09:34:23 jkh Exp $
#
# make release CHROOTDIR=/some/dir BUILDNAME=somename [ RELEASETAG=tag ]
#
@@ -516,7 +516,7 @@ cdrom.1:
@for i in ${DISTRIBUTIONS} ; \
do \
if [ -d ${RD}/trees/$${i} ] ; then \
- chflags -R noschg ${RD}/trees/$${i} ; \
+ chflags -R noschg ${RD}/trees/$${i} || true ; \
( cd ${RD}/trees/$${i} && \
find . -depth -print | cpio -dumpl ${CD_DISC2} ) ; \
fi \
diff --git a/sys/alpha/conf/Makefile.alpha b/sys/alpha/conf/Makefile.alpha
index 99f61697f914..72a0e3f75c6a 100644
--- a/sys/alpha/conf/Makefile.alpha
+++ b/sys/alpha/conf/Makefile.alpha
@@ -1,7 +1,7 @@
# Makefile.alpha -- with config changes.
# Copyright 1990 W. Jolitz
# from: @(#)Makefile.alpha 7.1 5/10/91
-# $Id: Makefile.alpha,v 1.15 1998/12/17 22:36:21 dfr Exp $
+# $Id: Makefile.alpha,v 1.16 1999/01/09 21:50:59 jdp Exp $
#
# Makefile for FreeBSD
#
@@ -251,7 +251,7 @@ install:
exit 1 ; \
fi
.if exists(${DESTDIR}/kernel)
- chflags noschg ${DESTDIR}/kernel
+ -chflags noschg ${DESTDIR}/kernel
mv ${DESTDIR}/kernel ${DESTDIR}/kernel.old
.endif
PATH=$${PATH}:/sbin:/usr/sbin; \
diff --git a/sys/i386/conf/Makefile.i386 b/sys/i386/conf/Makefile.i386
index ac087fe649c4..34302c97c5aa 100644
--- a/sys/i386/conf/Makefile.i386
+++ b/sys/i386/conf/Makefile.i386
@@ -1,7 +1,7 @@
# Makefile.i386 -- with config changes.
# Copyright 1990 W. Jolitz
# from: @(#)Makefile.i386 7.1 5/10/91
-# $Id: Makefile.i386,v 1.136.2.1 1999/01/25 04:10:58 peter Exp $
+# $Id: Makefile.i386,v 1.136.2.2 1999/01/27 20:51:40 julian Exp $
#
# Makefile for FreeBSD
#
@@ -220,7 +220,7 @@ install:
fi
.endif
.if exists(${DESTDIR}/kernel)
- chflags noschg ${DESTDIR}/kernel
+ -chflags noschg ${DESTDIR}/kernel
mv ${DESTDIR}/kernel ${DESTDIR}/kernel.old
.endif
PATH=$${PATH}:/sbin:/usr/sbin; \
diff --git a/sys/pc98/conf/Makefile.pc98 b/sys/pc98/conf/Makefile.pc98
index 1eb9646074b9..2eafc630073f 100644
--- a/sys/pc98/conf/Makefile.pc98
+++ b/sys/pc98/conf/Makefile.pc98
@@ -3,7 +3,7 @@
# Makefile.i386 -- with config changes.
# Copyright 1990 W. Jolitz
# from: @(#)Makefile.i386 7.1 5/10/91
-# $Id: Makefile.pc98,v 1.52.2.1 1999/01/25 13:30:05 kato Exp $
+# $Id: Makefile.pc98,v 1.52.2.2 1999/01/28 13:34:08 kato Exp $
#
# Makefile for FreeBSD
#
@@ -224,7 +224,7 @@ install:
fi
.endif
.if exists(${DESTDIR}/kernel)
- chflags noschg ${DESTDIR}/kernel
+ -chflags noschg ${DESTDIR}/kernel
mv ${DESTDIR}/kernel ${DESTDIR}/kernel.old
.endif
PATH=$${PATH}:/sbin:/usr/sbin; \
diff --git a/usr.bin/chpass/Makefile b/usr.bin/chpass/Makefile
index 3abed829d3ac..c17a4ce7ceb5 100644
--- a/usr.bin/chpass/Makefile
+++ b/usr.bin/chpass/Makefile
@@ -60,10 +60,10 @@ yppasswd_private_clnt.c: ${RPCSRC_PRIV}
beforeinstall:
.for i in chpass chfn chsh ypchpass ypchfn ypchsh
[ ! -e ${DESTDIR}${BINDIR}/$i ] || \
- chflags noschg ${DESTDIR}${BINDIR}/$i
+ chflags noschg ${DESTDIR}${BINDIR}/$i || true
.endfor
afterinstall:
- chflags schg ${DESTDIR}${BINDIR}/chpass
+ -chflags schg ${DESTDIR}${BINDIR}/chpass
.include <bsd.prog.mk>
diff --git a/usr.bin/passwd/Makefile b/usr.bin/passwd/Makefile
index cfa98db53e4a..f01fe6ddef29 100644
--- a/usr.bin/passwd/Makefile
+++ b/usr.bin/passwd/Makefile
@@ -1,5 +1,5 @@
# From: @(#)Makefile 8.3 (Berkeley) 4/2/94
-# $Id: Makefile,v 1.29 1998/08/06 21:37:51 markm Exp $
+# $Id: Makefile,v 1.30 1998/09/19 22:42:04 obrien Exp $
PROG= passwd
SRCS= local_passwd.c passwd.c pw_copy.c pw_util.c pw_yp.c \
@@ -70,10 +70,10 @@ DISTRIBUTION= krb
beforeinstall:
.for i in passwd yppasswd
[ ! -e ${DESTDIR}${BINDIR}/$i ] || \
- chflags noschg ${DESTDIR}${BINDIR}/$i
+ chflags noschg ${DESTDIR}${BINDIR}/$i || true
.endfor
afterinstall:
- chflags schg ${DESTDIR}${BINDIR}/passwd
+ -chflags schg ${DESTDIR}${BINDIR}/passwd
.include <bsd.prog.mk>