[BusyBox] [PATCH] lsmod & local ncurses

Robert Schwebel robert at schwebel.de
Sat Jan 11 03:49:03 UTC 2003


Erik,

the following patch fixes a missing \n in lsmod and adds support for
ncurses installed in /usr/local. 

Robert
-- 
 Dipl.-Ing. Robert Schwebel | http://www.pengutronix.de
 Pengutronix - Linux Solutions for Science and Industry
   Braunschweiger Str. 79,  31134 Hildesheim, Germany
   Handelsregister:  Amtsgericht Hildesheim, HRA 2686
    Phone: +49-5121-28619-0 |  Fax: +49-5121-28619-4
-------------- next part --------------
diff -x CVS -urN busybox/modutils/lsmod.c busybox-0.61pre-ptx4/modutils/lsmod.c
--- busybox/modutils/lsmod.c	2003-01-11 11:44:39.000000000 +0100
+++ busybox-0.61pre-ptx4/modutils/lsmod.c	2003-01-11 11:06:04.000000000 +0100
@@ -67,6 +67,7 @@
 	else {
 		printf("    Not tainted\n");
 	}
+	printf("\n");
 }
 #endif
 
diff -x CVS -urN busybox/scripts/config/Makefile busybox-0.61pre-ptx4/scripts/config/Makefile
--- busybox/scripts/config/Makefile	2003-01-11 11:44:59.000000000 +0100
+++ busybox-0.61pre-ptx4/scripts/config/Makefile	2003-01-11 11:06:04.000000000 +0100
@@ -14,6 +14,12 @@
 ifeq (/usr/include/ncurses/curses.h, $(wildcard /usr/include/ncurses/curses.h))
 	HOSTNCURSES += -I/usr/include/ncurses -DCURSES_LOC="<ncurses/curses.h>"
 else
+ifeq (/usr/local/include/ncurses/ncurses.h, $(wildcard /usr/local/include/ncurses/ncurses.h))
+	HOSTCFLAGS += -I/usr/local/include/ncurses -DCURSES_LOC="<ncurses.h>"
+else
+ifeq (/usr/local/include/ncurses/curses.h, $(wildcard /usr/local/include/ncurses/curses.h))
+	HOSTCFLAGS += -I/usr/local/include/ncurses -DCURSES_LOC="<ncurses/curses.h>"
+else
 ifeq (/usr/include/ncurses.h, $(wildcard /usr/include/ncurses.h))
 	HOSTNCURSES += -DCURSES_LOC="<ncurses.h>"
 else
@@ -21,7 +27,8 @@
 endif
 endif
 endif
-
+endif
+endif
 
 CONF_SRC  =conf.c
 MCONF_SRC =mconf.c checklist.c menubox.c textbox.c yesno.c inputbox.c util.c msgbox.c


More information about the busybox mailing list