From: sof <unknown>
Date: Thu, 26 Nov 1998 09:17:22 +0000 (+0000)
Subject: [project @ 1998-11-26 09:17:22 by sof]
X-Git-Tag: Approx_2487_patches~192
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=967cc47f37cb93a5e2b6df7822c9a646f0428247;p=ghc-hetmet.git

[project @ 1998-11-26 09:17:22 by sof]
don't include the non-conflict files that CVS leaves behind in the build tree
---

diff --git a/glafp-utils/lndir/lndir.c b/glafp-utils/lndir/lndir.c
index da8a467..0d77a49 100644
--- a/glafp-utils/lndir/lndir.c
+++ b/glafp-utils/lndir/lndir.c
@@ -207,6 +207,8 @@ int rel;			/* if true, prepend "../" to fn before using */
     while (dp = readdir (df)) {
 	if (dp->d_name[strlen(dp->d_name) - 1] == '~')
 	    continue;
+	if (dp->d_name[0] == '.' && dp->d_name[1] == '#') /* 'non-conflict files' left behind by CVS */
+	    continue;
 	strcpy (p, dp->d_name);
 
 	if (n_dirs > 0) {