diff options
| author | peter <peter@FreeBSD.org> | 1995-10-28 09:39:57 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 1995-10-28 09:39:57 +0000 |
| commit | 8284ee3abc51ad7310a9a48f250c7dd33fb6ce9f (patch) | |
| tree | 5e2f7fa1a31afb0f2a3ddf824f6acf4519678356 | |
| parent | 8e1f5c1aadc0c84c471992476b1a36c3509804f9 (diff) | |
| download | FreeBSD-src-8284ee3abc51ad7310a9a48f250c7dd33fb6ce9f.zip FreeBSD-src-8284ee3abc51ad7310a9a48f250c7dd33fb6ce9f.tar.gz | |
At the risk of starting a commit-war, attempt to fix once and for all, the
"make distrib-dirs" target.
Neither of Andrey's two attempts have worked for me with the [ -h ..]
test both with && and ||.
I've changed it to a full
if [ -h ...]; then \
rm ... ; \
fi ; \
construct. It's much clearer what's meant to happen, and it works! :-)
| -rw-r--r-- | etc/Makefile | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/etc/Makefile b/etc/Makefile index fddb92d..ad3c308 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 -# $Id: Makefile,v 1.123 1995/10/26 10:05:55 ache Exp $ +# $Id: Makefile,v 1.125 1995/10/28 02:01:34 ache Exp $ # disktab may be wrong -- hcx9 is a tahoe, but gets its own. # -rw-r--r-- @@ -448,7 +448,9 @@ distrib-dirs: then \ cd ${DESTDIR}/usr/share/locale; \ for l in ${LATIN1LINKS} ; do \ - [ -h $$l.ISO_8859-1 ] && rm $$l.ISO_8859-1; \ + if [ -h $$l.ISO_8859-1 ]; then \ + rm $$l.ISO_8859-1; \ + fi ; \ done; \ fi mtree -deU -f ${.CURDIR}/mtree/BSD.usr.dist -p ${DESTDIR}/usr |
