diff -r 690b5524b895 -r 9f7bbb768ba8 CMakeLists.txt
--- 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: ##