From: Francesco M. <fr...@us...> - 2008-01-15 00:03:08
|
Update of /cvsroot/wxlua/wxLua/modules/build/bakefiles In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv11251/modules/build/bakefiles Modified Files: modules.bkl Log Message: hack to be able to use bake 0.2.3 and still get correct installation rule Index: modules.bkl =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/build/bakefiles/modules.bkl,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** modules.bkl 10 Jan 2008 17:04:25 -0000 1.49 --- modules.bkl 15 Jan 2008 00:03:02 -0000 1.50 *************** *** 45,48 **** --- 45,57 ---- <!-- ================================================================== --> + <!-- HACK: instead of using the install-headers-to feature we currently + need to use this <data-files> target because of this bakefile + bug: http://www.bakefile.org/ticket/138 --> + <data-files> + <srcdir>$(SRCDIR)</srcdir> + <files>$(LUA_HDR)</files> + <install-to>$(INCLUDEDIR)</install-to> + </data-files> + <!-- the lua lib & dll: these are needed by all wxLua modules, specially for linking the "mod_luamodule" (see below); in fact, compiling statically the *************** *** 70,79 **** <sources>$(LUA_SRC)</sources> ! <headers prefix="lua/include"> ! $(removePrefixFromList('lua/include/', LUA_HDR)) ! </headers> <install-to>$(LIBDIR)</install-to> ! <install-headers-to>$(INCLUDEDIR)</install-headers-to> <!-- see options.bkl for these --> --- 79,89 ---- <sources>$(LUA_SRC)</sources> ! <headers>$(LUA_HDR)</headers> <install-to>$(LIBDIR)</install-to> ! ! <!-- see comment on the <data-files> above... ! ! <install-headers-to>$(PREFIX)</install-headers-to> --> <!-- see options.bkl for these --> *************** *** 94,103 **** <sources>$(LUA_SRC)</sources> ! <headers prefix="lua/include"> ! $(removePrefixFromList('lua/include/', LUA_HDR)) ! </headers> <install-to>$(LIBDIR)</install-to> ! <install-headers-to>$(INCLUDEDIR)</install-headers-to> <if cond="TARGETING_WIN32=='1'"> --- 104,114 ---- <sources>$(LUA_SRC)</sources> ! <headers>$(LUA_HDR)</headers> <install-to>$(LIBDIR)</install-to> ! ! <!-- see comment on the <data-files> above... ! ! <install-headers-to>$(PREFIX)</install-headers-to> --> <if cond="TARGETING_WIN32=='1'"> |