diff options
author | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-26 22:48:16 +0000 |
---|---|---|
committer | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-26 22:48:16 +0000 |
commit | 3b6fb2edeff78ae8326cc0ab6d5d6f32b17ff477 (patch) | |
tree | f0d39307964d0995239ae2bd387ddf8710bb324e | |
parent | bb537be5d3d9b8b716fbd0f2b04f21046fb133c4 (diff) |
merge latest (4.3.99.16) from XFree86 (vendor) branchXEVIE-BASE
-rw-r--r-- | lndir.c | 10 | ||||
-rw-r--r-- | lndir.man | 10 |
2 files changed, 11 insertions, 9 deletions
@@ -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")) @@ -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. |