socsvn commit: r225179 - soc2011/zy/nvi-iconv/head/rescue/rescue

[zy at FreeBSD.org]

Author: zy
Date: Wed Aug 17 07:38:47 2011
New Revision: 225179
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=225179

Log:
  Links to libcursesw if WITH_ICONV is defined.
   - Fixes vi (multibyte nvi2) in rescue.

Modified:
  soc2011/zy/nvi-iconv/head/rescue/rescue/Makefile

Modified: soc2011/zy/nvi-iconv/head/rescue/rescue/Makefile
==============================================================================
--- soc2011/zy/nvi-iconv/head/rescue/rescue/Makefile	Wed Aug 17 06:21:34 2011	(r225178)
+++ soc2011/zy/nvi-iconv/head/rescue/rescue/Makefile	Wed Aug 17 07:38:47 2011	(r225179)
@@ -52,7 +52,7 @@
 CRUNCH_PROGS_bin= cat chflags chio chmod cp date dd df echo 	\
 	 ed expr getfacl hostname kenv kill ln ls mkdir mv	\
 	 pkill ps pwd realpath rm rmdir setfacl sh stty sync test
-CRUNCH_LIBS+= -lcrypt -ledit -lkvm -ll -ltermcap -lutil
+CRUNCH_LIBS+= -lcrypt -ledit -lkvm -ll -lutil
 CRUNCH_BUILDTOOLS+= bin/sh
 
 # Additional options for specific programs
@@ -118,7 +118,13 @@
 # crunchgen does not like C++ programs; this should be fixed someday
 # CRUNCH_PROGS+= devd
 
-CRUNCH_LIBS+= -lalias -lcam -lcurses -ldevstat -lipsec
+.ifdef (WITH_ICONV)
+CRUNCH_LIBS+= -lcursesw
+.else
+CRUNCH_LIBS+= -lcurses -ltermcap
+.endif
+
+CRUNCH_LIBS+= -lalias -lcam -ldevstat -lipsec
 .if ${MK_IPX} != "no"
 CRUNCH_LIBS+= -lipx
 .endif