XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folksxf86-4_3_99_902xf86-4_3_99_901xf86-4_3_99_16

2 files changed, 11 insertions, 9 deletions

diff --git a/lndir.c b/lndir.c
index 05b5df5..9d06a4e 100644
--- a/lndir.c
+++ b/lndir.c
@@ -26,14 +26,14 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/config/util/lndir.c,v 3.17 2002/10/07 15:28:51 tsi Exp $ */
+/* $XFree86: xc/config/util/lndir.c,v 3.18 2003/06/24 15:44:45 eich Exp $ */
 
 /* From the original /bin/sh script:
 
   Used to create a copy of the a directory tree that has links for all
-  non-directories (except, by default, those named RCS, SCCS or CVS.adm).
-  If you are building the distribution on more than one machine, you
-  should use this technique.
+  non-directories (except, by default, those named BitKeeper, RCS, SCCS
+  or CVS.adm).  If you are building the distribution on more than one
+  machine, you should use this technique.
 
   If your master sources are located in /usr/local/src/X and you would like
   your link tree to be in /usr/local/src/new-X, do the following:
@@ -212,6 +212,8 @@ dodir (char *fn,		/* name of "from" directory, either absolute or
 					       dp->d_name[2] == '\0')))
 		    continue;
 		if (!with_revinfo) {
+		    if (!strcmp (dp->d_name, "BitKeeper"))
+			continue;
 		    if (!strcmp (dp->d_name, "RCS"))
 			continue;
 		    if (!strcmp (dp->d_name, "SCCS"))
diff --git a/lndir.man b/lndir.man
index 73abfcb..82246d2 100644
--- a/lndir.man
+++ b/lndir.man
@@ -25,7 +25,7 @@
 .\" from The Open Group.
 .\" 
 .\"
-.\" $XFree86: xc/config/util/lndir.man,v 1.4 2002/10/07 15:28:51 tsi Exp $
+.\" $XFree86: xc/config/util/lndir.man,v 1.5 2003/06/24 15:44:45 eich Exp $
 .\"
 .TH LNDIR 1 __xorgversion__
 .SH NAME
@@ -76,8 +76,8 @@ argument may be relative (e.g., ../src) and is relative to
 (not the current directory).
 .PP 
 .\" CVS.adm is used by the Concurrent Versions System.
-Note that RCS, SCCS, CVS and CVS.adm directories are shadowed only if
-the \fB\-withrevinfo\fP flag is specified.
+Note that BitKeeper, RCS, SCCS, CVS and CVS.adm directories are
+shadowed only if the \fB\-withrevinfo\fP flag is specified.
 .PP
 If you add files, simply run
 .I lndir
@@ -105,8 +105,8 @@ If the link is to a directory, this is almost certainly the wrong thing.
 This option exists mostly to emulate the behavior the C version of
 \fIlndir\fP had in X11R6.  Its use is not recommended.
 .IP \-withrevinfo
-Causes any RCS, SCCS, CVS and CVS.adm subdirectories to be treated as any other
-directory, rather than ignored.
+Causes any BitKeeper, RCS, SCCS, CVS and CVS.adm subdirectories to be
+treated as any other directory, rather than ignored.
 .SH DIAGNOSTICS
 The program displays the name of each subdirectory it enters, followed
 by a colon.  The \fB\-silent\fP option suppresses these messages.