From: Francesco M. <fr...@us...> - 2006-01-27 21:58:07
|
Update of /cvsroot/wxlua/wxLua/util/build/bakefiles In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18480/util/build/bakefiles Modified Files: util.bkl Log Message: fixed top_builddir problems Index: util.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/util/build/bakefiles/util.bkl,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** util.bkl 25 Jan 2006 18:35:59 -0000 1.7 --- util.bkl 27 Jan 2006 21:57:14 -0000 1.8 *************** *** 30,34 **** <!-- our base path --> <if cond="TARGETING_WIN32=='1'"> ! <set var="UTIL_BASEDIR">..$(DIRSEP)..</set> </if> <if cond="TARGETING_WIN32=='0'"> --- 30,36 ---- <!-- our base path --> <if cond="TARGETING_WIN32=='1'"> ! <set var="UTIL_BASEDIR">../..</set> ! <set var="WXLUA_BASEDIR">$(UTIL_BASEDIR)/..</set> ! <set var="WXLUA_BINOUTPUT_PATH">$(WXLUA_BASEDIR)/bin</set> </if> <if cond="TARGETING_WIN32=='0'"> *************** *** 38,41 **** --- 40,44 ---- --> <set var="UTIL_BASEDIR">$(top_srcdir)/util</set> + <set var="WXLUA_BINOUTPUT_PATH">$(top_builddir)bin</set> </if> <set var="SRCDIR">$(UTIL_BASEDIR)</set> *************** *** 49,53 **** <exe id="util_bin2c" cond="USE_BIN2C=='1'"> <exename>bin2c</exename> ! <dirname>$(UTIL_BASEDIR)$(DIRSEP)..$(DIRSEP)bin</dirname> <install-to>$(BINDIR)</install-to> <sources>bin2c/bin2c.c</sources> --- 52,56 ---- <exe id="util_bin2c" cond="USE_BIN2C=='1'"> <exename>bin2c</exename> ! <dirname>$(WXLUA_BINOUTPUT_PATH)</dirname> <install-to>$(BINDIR)</install-to> <sources>bin2c/bin2c.c</sources> |