diff options
| author | Peng Huang <shawn.p.huang@gmail.com> | 2010-07-16 14:02:10 +0800 |
|---|---|---|
| committer | Peng Huang <shawn.p.huang@gmail.com> | 2010-07-16 14:02:10 +0800 |
| commit | f2b7ff6d4eca3b9a6ca284575ff1cbce9d7d0c30 (patch) | |
| tree | c72dbfcae434c65ac442f3bf6937903062d4e4b9 /lua | |
| parent | d4eb78f97a6bf7a6a6aedbca7b13ca20b6e7cdb2 (diff) | |
| parent | f850d40f939175382e7b801d6b16b4651820c448 (diff) | |
| download | ibus-libpinyin-f2b7ff6d4eca3b9a6ca284575ff1cbce9d7d0c30.tar.gz ibus-libpinyin-f2b7ff6d4eca3b9a6ca284575ff1cbce9d7d0c30.tar.xz ibus-libpinyin-f2b7ff6d4eca3b9a6ca284575ff1cbce9d7d0c30.zip | |
Merge remote branch 'epic/master'
Diffstat (limited to 'lua')
| -rw-r--r-- | lua/Makefile.am | 13 | ||||
| -rw-r--r-- | lua/test-lua-plugin.c | 2 |
2 files changed, 11 insertions, 4 deletions
diff --git a/lua/Makefile.am b/lua/Makefile.am index d357e58..a834cf8 100644 --- a/lua/Makefile.am +++ b/lua/Makefile.am @@ -18,8 +18,14 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -lua_script_DATA = base.lua \ - $(NULL) +EXTRA_DIST = \ + base.lua \ + test.lua \ + $(NULL) + +lua_script_DATA = \ + base.lua \ + $(NULL) lua_scriptdir = $(pkgdatadir) @@ -45,11 +51,11 @@ libpylua_la_LIBADD = \ $(NULL) TESTS = \ - lua-ext-console \ test-lua-plugin \ $(NULL) noinst_PROGRAMS = \ + lua-ext-console \ $(TESTS) \ $(NULL) @@ -60,6 +66,7 @@ test_lua_plugin_SOURCES = \ test_lua_plugin_CFLAGS = \ @IBUS_CFLAGS@ \ @LUA_CFLAGS@ \ + -DLUASCRIPTDIR=\"$(top_srcdir)/lua\" \ $(NULL) test_lua_plugin_LDADD = \ diff --git a/lua/test-lua-plugin.c b/lua/test-lua-plugin.c index ac5ef62..e1a89e4 100644 --- a/lua/test-lua-plugin.c +++ b/lua/test-lua-plugin.c @@ -33,7 +33,7 @@ int main(int argc, char * argv[]){ IBusEnginePlugin * plugin; plugin = ibus_engine_plugin_new(); - ibus_engine_plugin_load_lua_script(plugin, "test.lua"); + ibus_engine_plugin_load_lua_script(plugin, LUASCRIPTDIR G_DIR_SEPARATOR_S "test.lua"); g_object_unref(plugin); |