From 57500993fb95c1dbd1d3c5018aef2831f45a0d75 Mon Sep 17 00:00:00 2001
From: espie <espie@openbsd.org>
Date: Thu, 14 Aug 2008 10:18:34 +0000
Subject: [PATCH] simplify S definition to just srcdir, since it appears
 there's no special case anymore. Note that you can always override it from
 the command line if you need it.

after discussion with deraadt@ and tedu@
---
 usr.sbin/config/mkmakefile.c | 22 +++-------------------
 1 file changed, 3 insertions(+), 19 deletions(-)

diff --git a/usr.sbin/config/mkmakefile.c b/usr.sbin/config/mkmakefile.c
index cba85e633c2..187febaf11b 100644
--- a/usr.sbin/config/mkmakefile.c
+++ b/usr.sbin/config/mkmakefile.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mkmakefile.c,v 1.30 2008/04/19 14:22:04 chl Exp $	*/
+/*	$OpenBSD: mkmakefile.c,v 1.31 2008/08/14 10:18:34 espie Exp $	*/
 /*	$NetBSD: mkmakefile.c,v 1.34 1997/02/02 21:12:36 thorpej Exp $	*/
 
 /*
@@ -260,24 +260,8 @@ emitdefs(FILE *fp)
 		return (1);
 	if (fprintf(fp, "PARAM=-DMAXUSERS=%d\n", maxusers) < 0)
 		return (1);
-	switch (*srcdir) {
-	case '/':
-		if (fprintf(fp, "S=\t%s\n", srcdir) < 0)
-			return (1);
-		break;
-	case '.':
-		if (fprintf(fp, "S!=\techo `/bin/pwd`/%s\n", srcdir) < 0)
-			return (1);
-		break;
-	default:
-		/*
-		 * libkern and libcompat "Makefile.inc"s want relative S
-		 * specification to begin with '.'.
-		 */
-		if (fprintf(fp, "S!=\techo .`/bin/pwd`/%s\n", srcdir) < 0)
-			return (1);
-		break;
-	}
+	if (fprintf(fp, "S=\t%s\n", srcdir) < 0)
+		return (1);
 	for (nv = mkoptions; nv != NULL; nv = nv->nv_next)
 		if (fprintf(fp, "%s=%s\n", nv->nv_name, nv->nv_str) < 0)
 			return (1);
-- 
2.20.1