From 22b374184d4be9aa062ff5db81671078e660d88a Mon Sep 17 00:00:00 2001
From: peter <peter@FreeBSD.org>
Date: Tue, 13 Apr 1999 18:22:57 +0000
Subject: Clean up the -g/DEBUG handling.  This logic can go in the Makefile so
 that config -g can work the same as:  makeoptions DEBUG="-g"

---
 usr.sbin/config/Makefile     |  6 +++---
 usr.sbin/config/configvers.h |  4 ++--
 usr.sbin/config/mkmakefile.c | 28 +++-------------------------
 3 files changed, 8 insertions(+), 30 deletions(-)

(limited to 'usr.sbin')

diff --git a/usr.sbin/config/Makefile b/usr.sbin/config/Makefile
index e994b0c..047dd96 100644
--- a/usr.sbin/config/Makefile
+++ b/usr.sbin/config/Makefile
@@ -1,5 +1,5 @@
 # 	@(#)Makefile	8.1 (Berkeley) 6/6/93
-#	$Id$
+#	$Id: Makefile,v 1.20 1998/05/06 15:27:57 bde Exp $
 
 PROG=	config
 CFLAGS+=-I. -I${.CURDIR}
@@ -9,6 +9,6 @@ MAN8=	config.8
 DPADD=	${LIBL}
 LDADD=	-ll
 
-.include <bsd.prog.mk>
+mkmakefile.o: configvers.h
 
-$(OBJS): configvers.h
+.include <bsd.prog.mk>
diff --git a/usr.sbin/config/configvers.h b/usr.sbin/config/configvers.h
index 35c31ad..292d60c 100644
--- a/usr.sbin/config/configvers.h
+++ b/usr.sbin/config/configvers.h
@@ -6,6 +6,6 @@
  * The numbering scheme is inspired by the sys/conf/newvers.sh RELDATE
  * and <osreldate.h> system.
  *
- * $Id: configvers.h,v 1.8 1998/11/15 18:07:35 dfr Exp $
+ * $Id: configvers.h,v 1.9 1999/04/07 09:42:29 grog Exp $
  */
-#define	CONFIGVERS	300010
+#define	CONFIGVERS	300011
diff --git a/usr.sbin/config/mkmakefile.c b/usr.sbin/config/mkmakefile.c
index a2ed836..77fcb46 100644
--- a/usr.sbin/config/mkmakefile.c
+++ b/usr.sbin/config/mkmakefile.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)mkmakefile.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-	"$Id: mkmakefile.c,v 1.35 1999/04/07 09:27:56 grog Exp $";
+	"$Id: mkmakefile.c,v 1.36 1999/04/11 03:40:10 grog Exp $";
 #endif /* not lint */
 
 /*
@@ -824,30 +824,8 @@ do_systemspec(f, fl, first)
 	int first;
 {
 
-	if (debugging) {
-		fprintf(f,
-			"KERNEL=\t\t%s\n"
-			"FULLKERNEL=\t%s.debug\n"
-			"INSTALL=\tinstall.debug\n\n"
-			"%s: %s.debug\n",
-			fl->f_needs,
-			fl->f_needs,
-			fl->f_needs,
-			fl->f_needs );
-		fprintf (f,
-			 "\tobjcopy --strip-debug %s.debug %s\n\n",
-			fl->f_needs,
-			fl->f_needs );
-		fprintf(f, "%s.debug: ${SYSTEM_DEP} swap%s.o", fl->f_needs, fl->f_fn);
-	} else {
-		fprintf(f,
-			"KERNEL=\t\t%s\n"
-			"FULLKERNEL=\t%s\n\n"
-			"INSTALL=\tinstall\n\n",
-			fl->f_needs,
-			fl->f_needs );
-		fprintf(f, "%s: ${SYSTEM_DEP} swap%s.o", fl->f_needs, fl->f_fn);
-	}
+	fprintf(f, "KERNEL=\t%s\n", fl->f_needs);
+	fprintf(f, "${FULLKERNEL}: ${SYSTEM_DEP} swap%s.o", fl->f_fn);
 	if (first)
 		fprintf(f, " vers.o");
 	fprintf(f, "\n\t${SYSTEM_LD_HEAD}\n");
-- 
cgit v1.1