--- a/CMakeLists.txt Wed Nov 28 18:38:52 2012 +0200
+++ b/CMakeLists.txt Wed Nov 28 19:18:46 2012 +0200
@@ -42,6 +42,7 @@
set(LUA_VERSION "5.1")
set(LUA_INCLUDE_DIRS ${LUA_INCLUDE_DIR})
endif()
+string(REPLACE "." "" LUA_MODULENAME "lua${LUA_VERSION}")
pkg_check_modules(GLIB REQUIRED glib-2.0)
pkg_check_modules(GMODULE REQUIRED gmodule-2.0)
pkg_check_modules(MCABBER REQUIRED mcabber)
@@ -77,7 +78,7 @@
${MCABBER_LIBRARRIES})
include_directories(${lua_SOURCE_DIR}
${lua_BINARY_DIR})
-set_target_properties(lua PROPERTIES COMPILE_FLAGS "-Wall" OUTPUT_NAME "lua${LUA_VERSION}")
+set_target_properties(lua PROPERTIES COMPILE_FLAGS "-Wall" OUTPUT_NAME "${LUA_MODULENAME}")
## Extra targets
if(DOCGEN_EXECUTABLE)
@@ -88,7 +89,7 @@
endif()
## Packaging information
-set(CPACK_PACKAGE_NAME mcabber-mod-lua${LUA_VERSION})
+set(CPACK_PACKAGE_NAME mcabber-mod-${LUA_MODULENAME})
set(CPACK_PACKAGE_VERSION ${PROJECT_VERSION})
set(CPACK_PACKAGE_VENDOR "IsBear")
set(CPACK_PACKAGE_CONTACT "Myhailo Danylenko <isbear@ukrpost.net>")
@@ -120,9 +121,7 @@
else()
set(AVV_COMPL_VERSION "compl:3")
endif()
-string(REPLACE "." "_" AVV_FILENAME "lua${LUA_VERSION}")
-set(MODULE_RELATIVE_PATH "lib/mcabber/${CMAKE_SHARED_MODULE_PREFIX}lua${LUA_VERSION}${CMAKE_SHARED_MODULE_SUFFIX}")
-configure_file(lua.avv.in.in "${AVV_FILENAME}.avv.in" @ONLY)
+configure_file(lua.avv.in ${LUA_MODULENAME}.avv)
## Set up installer
install(TARGETS lua DESTINATION lib/mcabber)
@@ -132,7 +131,6 @@
install(DIRECTORY examples DESTINATION share/doc/${CPACK_PACKAGE_NAME} PATTERN "*~" EXCLUDE)
install(FILES docs/readme.mdwn docs/todo.mdwn COPYING DESTINATION share/doc/${CPACK_PACKAGE_NAME})
install(FILES help/en/hlp_lua.txt DESTINATION share/mcabber RENAME hlp_lua${LUA_VERSION}.txt) # XXX localizations/other help
-install(CODE "configure_file(${PROJECT_BINARY_DIR}/${AVV_FILENAME}.avv.in ${PROJECT_BINARY_DIR}/${AVV_FILENAME}.avv)")
-install(FILES ${PROJECT_BINARY_DIR}/${AVV_FILENAME}.avv DESTINATION share/mcabber/avv/modules RENAME ${AVV_FILENAME})
+install(FILES ${PROJECT_BINARY_DIR}/${LUA_MODULENAME}.avv DESTINATION share/mcabber/avv/modules RENAME ${LUA_MODULENAME})
## The End ## vim: se ts=4 sw=4: ##
--- a/config.h.in Wed Nov 28 18:38:52 2012 +0200
+++ b/config.h.in Wed Nov 28 19:18:46 2012 +0200
@@ -44,14 +44,14 @@
#define PROJECT_VERSION ( "${PROJECT_VERSION}" )
-#define MLUA_COMMAND_NAME "lua${LUA_VERSION}"
+#define MLUA_COMMAND_NAME "${LUA_MODULENAME}"
#define OPT_MLUA_RC "${OPT_MLUA_RC}"
#define OPT_MLUA_LM_DEBUG "${OPT_MLUA_LM_DEBUG}"
#ifndef HAVE_LUA52
# define lua_rawlen lua_objlen
# define luaL_setfuncs(STATE, REGTABLE, IGZERO) luaL_register ( STATE, NULL, REGTABLE )
-# define info_lua5_2 info_lua5_1
+# define info_lua52 info_lua51
#endif
#ifdef DEBUG
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/lua.avv.in Wed Nov 28 19:18:46 2012 +0200
@@ -0,0 +1,17 @@
+
+Name: ${LUA_MODULENAME}
+Method: glib
+Version: ${PROJECT_VERSION}
+Description: ${CPACK_PACKAGE_DESCRIPTION_SUMMARY}
+# commands depend on build environment: 4+3, 2+1
+# completion depends on constants: 3, 2+1
+Requires: utils:2 + ( roster:4 | roster:3 | roster:2 | roster:1 ) + ( commands:4 | commands:3 ) +
+ ( ${AVV_COMPL_VERSION} ) + events:1 + utils:2 + ( hooks:5 | hooks:4 | hooks:3 | hooks:2 ) +
+ ( xmpp:6 | xmpp:5 | xmpp:4 | xmpp:3 | xmpp:2 | xmpp:1 ) + api:1 + main:1 +
+ ( screen:10 | screen:9 | screen:8 | screen:7 | screen:6 | screen:5 | screen:4 ) +
+ logprint:3 + ( hbuf:3 | hbuf:2 | hbuf:1 ) + settings:1 +
+ ( xmpp_helper:2 | xmpp_helper:1 )
+Provides: lua:1
+Init: mlua_init
+Uninit: mlua_uninit
+
--- a/lua.avv.in.in Wed Nov 28 18:38:52 2012 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-
-Name: @PROJECT_NAME@@LUA_VERSION@
-Method: glib
-Location: ${CMAKE_INSTALL_PREFIX}/@MODULE_RELATIVE_PATH@
-Version: @PROJECT_VERSION@
-Description: @CPACK_PACKAGE_DESCRIPTION_SUMMARY@
-# commands depend on build environment: 4+3, 2+1
-# completion depends on constants: 3, 2+1
-Requires: utils:2 + ( roster:4 | roster:3 | roster:2 | roster:1 ) + ( commands:4 | commands:3 ) +
- ( ${AVV_COMPL_VERSION} ) + events:1 + utils:2 + ( hooks:5 | hooks:4 | hooks:3 | hooks:2 ) +
- ( xmpp:6 | xmpp:5 | xmpp:4 | xmpp:3 | xmpp:2 | xmpp:1 ) + api:1 + main:1 +
- ( screen:10 | screen:9 | screen:8 | screen:7 | screen:6 | screen:5 | screen:4 ) +
- logprint:3 + ( hbuf:3 | hbuf:2 | hbuf:1 ) + settings:1 +
- ( xmpp_helper:2 | xmpp_helper:1 )
-Provides: lua:1
-Init: mlua_init
-Uninit: mlua_uninit
-