From 796c4b028270124c2415ae5b317ae85a799741a0 Mon Sep 17 00:00:00 2001
From: sjg <sjg@NetBSD.org>
Date: Mon, 13 Sep 2010 20:34:21 +0000
Subject: [PATCH] We do not need filemon(9) to have a .meta file

---
 usr.bin/make/meta.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/usr.bin/make/meta.c b/usr.bin/make/meta.c
index edc5cb2d3cd5..bd9eb1342ca0 100644
--- a/usr.bin/make/meta.c
+++ b/usr.bin/make/meta.c
@@ -37,7 +37,9 @@
 #include <fcntl.h>
 #include <libgen.h>
 #include <errno.h>
+#if !defined(HAVE_CONFIG_H) || defined(HAVE_ERR_H)
 #include <err.h>
+#endif
 
 #include "make.h"
 #include "job.h"
@@ -70,6 +72,10 @@ extern Boolean comatMake;
 # define ROUNDUP(n, u)   (N2U((n), (u)) * (u))
 #endif
 
+#if !defined(HAVE_STRSEP)
+# define strsep(s, d) stresep((s), (d), 0)
+#endif
+
 /*
  * Filemon is a kernel module which snoops certain syscalls.
  *
@@ -567,11 +573,9 @@ meta_job_error(Job *job, GNode *gn, int flags, int status)
     }
     getcwd(cwd, sizeof(cwd));
     Var_Set(".ERROR_CWD", cwd, VAR_GLOBAL, 0);
-#ifdef USE_FILEMON
     if (pbm) {
 	Var_Set(".ERROR_META_FILE", pbm->meta_fname, VAR_GLOBAL, 0);
     }
-#endif
 }
 
 void