add LIBS option the crunchgen config, allows adding custom libraries

in list.local (e.g. for adding ssh to the ramdisk); ok deraadt@

2 files changed, 12 insertions, 4 deletions

diff --git a/distrib/miniroot/list2sh.awk b/distrib/miniroot/list2sh.awk
index c7f808b9dd1..f39bd3250d0 100644
--- a/distrib/miniroot/list2sh.awk
+++ b/distrib/miniroot/list2sh.awk
@@ -1,4 +1,4 @@
-#	$OpenBSD: list2sh.awk,v 1.9 2002/05/10 23:43:22 deraadt Exp $
+#	$OpenBSD: list2sh.awk,v 1.10 2002/05/24 13:19:48 markus Exp $
 #	$NetBSD: list2sh.awk,v 1.2 1996/05/04 15:45:31 pk Exp $
 
 BEGIN {
@@ -46,6 +46,10 @@ $1 == "SRCDIRS" {
 	# crunchgen directive; ignored here
 	next;
 }
+$1 == "LIBS" {
+	# crunchgen directive; ignored here
+	next;
+}
 $1 == "CRUNCHSPECIAL" {
 	# crunchgen directive; ignored here
 	next;
diff --git a/distrib/miniroot/makeconf.awk b/distrib/miniroot/makeconf.awk
index e1cdba40132..03b2645cf5b 100644
--- a/distrib/miniroot/makeconf.awk
+++ b/distrib/miniroot/makeconf.awk
@@ -1,4 +1,4 @@
-#	$OpenBSD: makeconf.awk,v 1.8 2002/04/30 03:23:44 deraadt Exp $
+#	$OpenBSD: makeconf.awk,v 1.9 2002/05/24 13:19:48 markus Exp $
 #	$NetBSD: makeconf.awk,v 1.3 1996/05/04 15:45:32 pk Exp $
 
 #
@@ -7,8 +7,12 @@
 
 BEGIN {
 	printf("#\n# This file is automatically generated by `makeconf'\n#\n\n");
-	printf("\nlibs -lutil -lotermcap -ll -lm -lkrb -ldes\n");
+	libs = "libs -lutil -lotermcap -ll -lm -lkrb -ldes";
+}
 
+$1 == "LIBS" {
+	$1 = tolower($1);
+	libs = $0;
 }
 
 $1 == "SRCDIRS" {
@@ -59,7 +63,7 @@ END {
 		for (i = 1; i <= n; i++)
 			printf("ln %s %s\n", p, links[i,p]);
 	}
-	printf("\n\n");
+	printf("\n%s\n\n", libs);
 
 	# `special' directives
 	for (s in specials) {