From owner-freebsd-doc  Wed Oct  6  6:30:15 1999
Delivered-To: freebsd-doc@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21])
	by hub.freebsd.org (Postfix) with ESMTP id 6F8B21544A
	for <freebsd-doc@freebsd.org>; Wed,  6 Oct 1999 06:30:12 -0700 (PDT)
	(envelope-from gnats@FreeBSD.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.9.3/8.9.2) id GAA62445;
	Wed, 6 Oct 1999 06:30:02 -0700 (PDT)
	(envelope-from gnats@FreeBSD.org)
Received: from terrapin.ru.ac.za (terrapin.ru.ac.za [146.231.128.6])
	by hub.freebsd.org (Postfix) with ESMTP id DE9E4152B6
	for <FreeBSD-gnats-submit@freebsd.org>; Wed,  6 Oct 1999 06:28:23 -0700 (PDT)
	(envelope-from nbm@mithrandr.moria.org)
Received: from duca.dialup.ru.ac.za ([146.231.98.24] helo=mithrandr.moria.org)
	by terrapin.ru.ac.za with esmtp (Exim 3.03 #1)
	id 11Yr73-000Jbz-00
	for FreeBSD-gnats-submit@freebsd.org; Wed, 06 Oct 1999 15:28:09 +0200
Received: (qmail 33113 invoked by uid 1001); 6 Oct 1999 12:39:15 -0000
Message-Id: <19991006123915.33112.qmail@mithrandr.moria.org>
Date: 6 Oct 1999 12:39:15 -0000
From: nbm@rucus.ru.ac.za
Reply-To: nbm@rucus.ru.ac.za
To: FreeBSD-gnats-submit@freebsd.org
X-Send-Pr-Version: 3.2
Subject: docs/14163: fix handbook symlink install problem with old version installed
Sender: owner-freebsd-doc@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.org


>Number:         14163
>Category:       docs
>Synopsis:       fix handbook symlink install problem with old version installed
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-doc
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Oct  6 06:30:02 PDT 1999
>Closed-Date:
>Last-Modified:
>Originator:     Neil Blakey-Milner
>Release:        FreeBSD 4.0-CURRENT i386
>Organization:
Rhodes University Computer Users' Society
>Environment:

FreeBSD mithrandr.moria.org 4.0-CURRENT FreeBSD 4.0-CURRENT #2: Wed Sep 29 17:30:21 SAST 1999     root@mithrandr.moria.org:/usr/src/sys/compile/MITHRANDR  i386

>Description:

The 'symlinks' target uses rm -f to remove any already existing
symlinks; in the case of /usr/share/doc/handbook this is a directory,
not a symlink.

It should probably be rm -rf instead.

>How-To-Repeat:

mkdir /usr/share/doc/handbook
cd /usr/doc/en_US.ISO_8859-1/books && make install

>Fix:

cvs diff: Diffing .
Index: doc.subdir.mk
===================================================================
RCS file: /home/nbm/ncvs/doc/share/mk/doc.subdir.mk,v
retrieving revision 1.2
diff -u -r1.2 doc.subdir.mk
--- doc.subdir.mk	1999/09/06 06:53:39	1.2
+++ doc.subdir.mk	1999/10/06 12:34:20
@@ -106,7 +106,7 @@
 			${ECHO} "$${d}/$${l} doesn't exist, not linking"; \
 		else \
 			${ECHO} $${d}/$${t} -\> $${d}/$${l}; \
-			(cd $${d} && rm -f $${t}); \
+			(cd $${d} && rm -rf $${t}); \
 			(cd $${d} && ln -s $${l} $${t}); \
 		fi; \
 	done



>Release-Note:
>Audit-Trail:
>Unformatted:


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-doc" in the body of the message