From owner-p4-projects@FreeBSD.ORG Tue Dec 20 04:39:02 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8DA5E16A422; Tue, 20 Dec 2005 04:39:01 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3B81E16A41F for ; Tue, 20 Dec 2005 04:39:01 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BE60943D55 for ; Tue, 20 Dec 2005 04:39:00 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jBK4d0rv057699 for ; Tue, 20 Dec 2005 04:39:00 GMT (envelope-from soc-andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jBK4d0DE057696 for perforce@freebsd.org; Tue, 20 Dec 2005 04:39:00 GMT (envelope-from soc-andrew@freebsd.org) Date: Tue, 20 Dec 2005 04:39:00 GMT Message-Id: <200512200439.jBK4d0DE057696@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-andrew@freebsd.org using -f From: soc-andrew To: Perforce Change Reviews Cc: Subject: PERFORCE change 88438 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Dec 2005 04:39:02 -0000 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