[src/trunk]: src/usr.bin/make grr too many different compilation options.

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/58116c8ea5b6
branches:  trunk
changeset: 338944:58116c8ea5b6
user:      christos <christos%NetBSD.org@localhost>
date:      Thu Jun 18 19:49:08 2015 +0000

description:
grr too many different compilation options.

diffstat:

 usr.bin/make/metachar.c |  18 +++++++++++-------
 1 files changed, 11 insertions(+), 7 deletions(-)

diffs (33 lines):

diff -r 8c5e4bc08498 -r 58116c8ea5b6 usr.bin/make/metachar.c
--- a/usr.bin/make/metachar.c   Thu Jun 18 17:21:55 2015 +0000
+++ b/usr.bin/make/metachar.c   Thu Jun 18 19:49:08 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: metachar.c,v 1.3 2015/06/18 15:51:57 christos Exp $    */
+/*     $NetBSD: metachar.c,v 1.4 2015/06/18 19:49:08 christos Exp $    */
 
 /*-
  * Copyright (c) 2015 The NetBSD Foundation, Inc.
@@ -28,13 +28,17 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
-#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: metachar.c,v 1.3 2015/06/18 15:51:57 christos Exp $";
-#else
+
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
+#if defined(MAKE_NATIVE) || defined(HAVE_NBTOOL_CONFIG_H)
 #include <sys/cdefs.h>
-#ifndef lint
-__RCSID("$NetBSD: metachar.c,v 1.3 2015/06/18 15:51:57 christos Exp $");
-#endif /* not lint */
+#endif
+
+#if defined(__RCSID) && !defined(lint)
+__RCSID("$NetBSD: metachar.c,v 1.4 2015/06/18 19:49:08 christos Exp $");
 #endif
 
 #include "metachar.h"