Fri Jan 25 19:07:15 2013 UTC ()
When using -ledit, also use -lterminfo, to allow static linking.


(he)
diff -r1.37 -r1.38 src/bin/csh/Makefile
cvs diff -r1.37 -r1.38 src/bin/csh/Makefile (expand / switch to unified diff)

--- src/bin/csh/Makefile 2013/01/25 14:20:57 1.37
+++ src/bin/csh/Makefile 2013/01/25 19:07:14 1.38
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.37 2013/01/25 14:20:57 christos Exp $ 1# $NetBSD: Makefile,v 1.38 2013/01/25 19:07:14 he Exp $
2# @(#)Makefile 8.1 (Berkeley) 5/31/93 2# @(#)Makefile 8.1 (Berkeley) 5/31/93
3# 3#
4# C Shell with process control; VM/UNIX VAX Makefile 4# C Shell with process control; VM/UNIX VAX Makefile
5# Bill Joy UC Berkeley; Jim Kulp IIASA, Austria 5# Bill Joy UC Berkeley; Jim Kulp IIASA, Austria
6# 6#
7# To profile, put -DPROF in DFLAGS and -pg in COPTS, and recompile. 7# To profile, put -DPROF in DFLAGS and -pg in COPTS, and recompile.
8 8
9.include <bsd.own.mk> 9.include <bsd.own.mk>
10 10
11PROG= csh 11PROG= csh
12DFLAGS=-DBUILTIN -DFILEC -DNLS -DSHORT_STRINGS 12DFLAGS=-DBUILTIN -DFILEC -DNLS -DSHORT_STRINGS
13# - Editor history not always aligned with shell history, 13# - Editor history not always aligned with shell history,
14# should implement internally 14# should implement internally
@@ -54,22 +54,22 @@ const.h: const.c @@ -54,22 +54,22 @@ const.h: const.c
54.if make(install) 54.if make(install)
55SUBDIR+=USD.doc 55SUBDIR+=USD.doc
56.endif 56.endif
57 57
58# XXX Only GCC 4.1 problem 58# XXX Only GCC 4.1 problem
59.if defined(HAVE_GCC) && ${HAVE_GCC} == 4 && ${MACHINE_ARCH} == "vax" 59.if defined(HAVE_GCC) && ${HAVE_GCC} == 4 && ${MACHINE_ARCH} == "vax"
60COPTS.parse.c+= -O0 60COPTS.parse.c+= -O0
61.endif 61.endif
62COPTS.err.c = -Wno-format-nonliteral 62COPTS.err.c = -Wno-format-nonliteral
63COPTS.printf.c = -Wno-format-nonliteral 63COPTS.printf.c = -Wno-format-nonliteral
64COPTS.proc.c = -Wno-format-nonliteral 64COPTS.proc.c = -Wno-format-nonliteral
65 65
66.if !empty(DFLAGS:M*EDIT) 66.if !empty(DFLAGS:M*EDIT)
67LDADD+=-ledit -lutil 67LDADD+=-ledit -lterminfo -lutil
68DPADD+=${LIBEDIT} ${LIBUTIL} 68DPADD+=${LIBEDIT} ${LIBUTIL}
69.else 69.else
70LDADD+=-lutil 70LDADD+=-lutil
71DPADD+=${LIBUTIL} 71DPADD+=${LIBUTIL}
72.endif 72.endif
73 73
74.include <bsd.prog.mk> 74.include <bsd.prog.mk>
75.include <bsd.subdir.mk> 75.include <bsd.subdir.mk>