Wed Jan 19 11:55:50 2011 UTC ()
libterminfo needs to come after libedit for static linking
(while here, coalesce LDADD/DPADD lines)


(plunky)
diff -r1.4 -r1.5 src/external/mit/lua/usr.bin/lua/Makefile
cvs diff -r1.4 -r1.5 src/external/mit/lua/usr.bin/lua/Makefile (expand / switch to unified diff)

--- src/external/mit/lua/usr.bin/lua/Makefile 2011/01/19 11:38:15 1.4
+++ src/external/mit/lua/usr.bin/lua/Makefile 2011/01/19 11:55:50 1.5
@@ -1,20 +1,17 @@ @@ -1,20 +1,17 @@
1# $NetBSD: Makefile,v 1.4 2011/01/19 11:38:15 plunky Exp $ 1# $NetBSD: Makefile,v 1.5 2011/01/19 11:55:50 plunky Exp $
2 2
3PROG= lua 3PROG= lua
4SRCS= lua.c 4SRCS= lua.c
5BINDIR= /usr/bin 5BINDIR= /usr/bin
6 6
7CPPFLAGS+= -DLUA_USE_READLINE 7CPPFLAGS+= -DLUA_USE_READLINE
8 8
9LDADD+= -llua 9LDADD+= -llua -lm -ledit -lterminfo
10DPADD+= ${LIBLUA} 10DPADD+= ${LIBLUA} ${LIBM} ${LIBEDIT} ${LIBTERMINFO}
11 
12LDADD+= -lterminfo -lm -ledit 
13DPADD+= ${LIBTERMINFO} ${LIBM} ${LIBEDIT} 
14 11
15.include <bsd.own.mk> 12.include <bsd.own.mk>
16 13
17.PATH: ${NETBSDSRCDIR}/external/mit/lua/dist/src \ 14.PATH: ${NETBSDSRCDIR}/external/mit/lua/dist/src \
18 ${NETBSDSRCDIR}/external/mit/lua/dist/doc 15 ${NETBSDSRCDIR}/external/mit/lua/dist/doc
19 16
20.include <bsd.prog.mk> 17.include <bsd.prog.mk>