Date: Tue, 20 Dec 2005 04:39:00 GMT From: soc-andrew <soc-andrew@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 88438 for review Message-ID: <200512200439.jBK4d0DE057696@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=88438 Change 88438 by soc-andrew@soc-andrew_serv on 2005/12/20 04:38:58 Rename bsd_lua -> bsdlua, libbsd_lua -> libbsdlua, libbsd_lualib -> libbsdlualib Install the lua headers with a bsd prefix, ie lua.h as bsdlua.h Affected files ... .. //depot/projects/soc2005/bsdinstaller/src/lib/lua/lua/Makefile#3 edit .. //depot/projects/soc2005/bsdinstaller/src/lib/lua/lualib/Makefile#3 edit .. //depot/projects/soc2005/bsdinstaller/src/release/bsdinstaller/bsdinstaller_shell.sh#7 edit .. //depot/projects/soc2005/bsdinstaller/src/usr.bin/lua/Makefile#3 edit Differences ... ==== //depot/projects/soc2005/bsdinstaller/src/lib/lua/lua/Makefile#3 (text+ko) ==== @@ -1,11 +1,20 @@ -LIB=bsd_lua +LIB=bsdlua SRCS= lapi.c lcode.c ldebug.c ldo.c ldump.c lfunc.c lgc.c llex.c lmem.c \ lobject.c lopcodes.c lparser.c lstate.c lstring.c ltable.c ltests.c \ - ltm.c lundump.c lvm.c lzio.c + ltm.c lundump.c lvm.c lzio.c bsdlua.h bsdlauxlib.h SHLIB_MAJOR=5 +INCS= bsdlua.h bsdlauxlib.h +CLEANFILES+= bsdlua.h bsdlauxlib.h + +bsdlua.h: + cp ${LUA_DIR}/include/lua.h ${.OBJDIR}/bsdlua.h + +bsdlauxlib.h: + sed "s|lua\.h|bsdlua\.h|" < ${LUA_DIR}/include/lauxlib.h > ${.OBJDIR}/bsdlauxlib.h + .include <${.CURDIR}/../Makefile.inc1> .PATH: ${LUA_DIR}/src ==== //depot/projects/soc2005/bsdinstaller/src/lib/lua/lualib/Makefile#3 (text+ko) ==== @@ -1,7 +1,14 @@ -LIB=bsd_lualib +LIB=bsdlualib SRCS= lauxlib.c lbaselib.c ldblib.c liolib.c lmathlib.c ltablib.c lstrlib.c \ - loadlib.c + loadlib.c bsdlualib.h + +INCS= bsdlualib.h +CLEANFILES+= bsdlualib.h + +bsdlualib.h: + sed "s|lua\.h|bsdlua\.h|" < ${LUA_DIR}/include/lualib.h > ${.OBJDIR}/bsdlualib.h + SHLIB_MAJOR=5 CFLAGS+=-DUSE_DLOPEN=1 ==== //depot/projects/soc2005/bsdinstaller/src/release/bsdinstaller/bsdinstaller_shell.sh#7 (text+ko) ==== @@ -13,7 +13,7 @@ /usr/sbin/bsd_installer_ncurses elif [ ${TTY} = "/dev/ttyv1" ] then - LUA_PATH="/usr/lib/lua/?.lua;/usr/libexec/bsdinstaller/lib/?.lua" LUA_CPATH=/usr/lib/lua/?.so LUA_SOPATH=/usr/lib/lua/ bsd_lua -lcompat-5.1 /usr/libexec/bsdinstaller/main.lua /usr/libexec/bsdinstaller/conf/BSDInstaller.lua /usr/libexec/bsdinstaller/conf/FreeBSD.lua dir.root=/ booted_from_install_media=true + LUA_PATH="/usr/lib/lua/?.lua;/usr/libexec/bsdinstaller/lib/?.lua" LUA_CPATH=/usr/lib/lua/?.so LUA_SOPATH=/usr/lib/lua/ bsdlua -lcompat-5.1 /usr/libexec/bsdinstaller/main.lua /usr/libexec/bsdinstaller/conf/BSDInstaller.lua /usr/libexec/bsdinstaller/conf/FreeBSD.lua dir.root=/ booted_from_install_media=true #/usr/sbin/bsd_installer_be if [ $? -eq 5 ] then ==== //depot/projects/soc2005/bsdinstaller/src/usr.bin/lua/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -PROG= bsd_lua +PROG= bsdlua SRCS= lua.c LUA_DIR=${.CURDIR}/../../contrib/lua/lua @@ -7,8 +7,8 @@ CFLAGS+=-I${LUA_DIR}/include LDADD= -lm -LDADD+= -L${LUA_LIB}/lua -lbsd_lua -LDADD+= -L${LUA_LIB}/lualib -lbsd_lualib +LDADD+= -L${LUA_LIB}/lua -lbsdlua +LDADD+= -L${LUA_LIB}/lualib -lbsdlualib NOMAN=1
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200512200439.jBK4d0DE057696>