Remove version suffix from modules path

CMakeLists.txt

@@ -144,17 +144,22 @@ include_directories("${PROJECT_SOURCE_DIR}/third_party")
 # Specify Tarantool modules prefixes
 #
 
-set(MODULE_SUFFIX "tarantool/${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}")
-set(MODULE_LIBDIR "${CMAKE_INSTALL_FULL_LIBDIR}/${MODULE_SUFFIX}")
-set(MODULE_LUADIR "${CMAKE_INSTALL_FULL_DATADIR}/${MODULE_SUFFIX}")
-set(MODULE_INCLUDEDIR "${CMAKE_INSTALL_FULL_INCLUDEDIR}/${MODULE_SUFFIX}")
-message(STATUS "Module sources: ${MODULE_LUADIR}")
-message(STATUS "Module libraries:${MODULE_LIBDIR}")
-message(STATUS "Module includes: ${MODULE_INCLUDEDIR}")
-
-list(APPEND MODULE_LUAPATH "${MODULE_LUADIR}/?.lua")
-list(APPEND MODULE_LUAPATH "${MODULE_LUADIR}/?/init.lua")
-list(APPEND MODULE_LIBPATH "${MODULE_LIBDIR}/?${CMAKE_SHARED_MODULE_SUFFIX}")
+set(MODULE_SUFFIX "tarantool")
+set(MODULE_LIBDIR "${CMAKE_INSTALL_LIBDIR}/${MODULE_SUFFIX}")
+set(MODULE_LUADIR "${CMAKE_INSTALL_DATADIR}/${MODULE_SUFFIX}")
+set(MODULE_INCLUDEDIR "${CMAKE_INSTALL_INCLUDEDIR}/${MODULE_SUFFIX}")
+
+set(MODULE_FULL_LIBDIR "${CMAKE_INSTALL_PREFIX}/${MODULE_LIBDIR}")
+set(MODULE_FULL_LUADIR "${CMAKE_INSTALL_PREFIX}/${MODULE_LUADIR}")
+set(MODULE_FULL_INCLUDEDIR "${CMAKE_INSTALL_PREFIX}/${MODULE_INCLUDEDIR}")
+
+message(STATUS "Module sources: ${MODULE_FULL_LUADIR}")
+message(STATUS "Module libraries:${MODULE_FULL_LIBDIR}")
+message(STATUS "Module includes: ${MODULE_FULL_INCLUDEDIR}")
+
+list(APPEND MODULE_LUAPATH "${MODULE_FULL_LUADIR}/?.lua")
+list(APPEND MODULE_LUAPATH "${MODULE_FULL_LUADIR}/?/init.lua")
+list(APPEND MODULE_LIBPATH "${MODULE_FULL_LIBDIR}/?${CMAKE_SHARED_MODULE_SUFFIX}")
 message(STATUS "Module package.path: ${MODULE_LUAPATH}")
 message(STATUS "Module package.cpath: ${MODULE_LIBPATH}")
 

debian/libtarantool-dev.install

-connector/c/include/tp.h	/usr/include/tarantool/1.5/
+connector/c/include/tp.h	/usr/include/tarantool/

debian/rules

@@ -29,7 +29,7 @@ DEB_CMAKE_NORMAL_ARGS := -DCMAKE_INSTALL_PREFIX="$(DEB_CMAKE_INSTALL_PREFIX)" \
 #    -DCMAKE_C_COMPILER:FILEPATH="$(CC)" \
 #    -DCMAKE_CXX_COMPILER:FILEPATH="$(CXX)" \
 
-DEB_SHLIBDEPS_INCLUDE          := /usr/lib/tarantool/1.5
+DEB_SHLIBDEPS_INCLUDE          := /usr/lib/tarantool
 DEB_INSTALL_DOCS_ALL 		:= -XTODO -XAUTHORS
 DEB_DH_STRIP_ARGS_tarantool	:= -X/usr/bin/tarantool_box
 

debian/tarantool-dev.install

-/usr/include/tarantool/1.5/config.h
-/usr/include/tarantool/1.5/lauxlib.h
-/usr/include/tarantool/1.5/luaconf.h
-/usr/include/tarantool/1.5/lua.h
-/usr/include/tarantool/1.5/lua.hpp
-/usr/include/tarantool/1.5/luajit.h
-/usr/include/tarantool/1.5/lualib.h
+usr/include/tarantool/config.h
+usr/include/tarantool/lauxlib.h
+usr/include/tarantool/luaconf.h
+usr/include/tarantool/lua.h
+usr/include/tarantool/lua.hpp
+usr/include/tarantool/luajit.h
+usr/include/tarantool/lualib.h

debian/tarantool-mysql-module.install

-usr/lib/tarantool/1.5/box/net/mysql.so
+usr/lib/tarantool/box/net/mysql.so
 

debian/tarantool-postgresql-module.install

-usr/lib/tarantool/1.5/box/net/pg.so
+usr/lib/tarantool/box/net/pg.so

debian/tarantool-sophia-module.install

-usr/lib/tarantool/1.5/box/sophia.so
+usr/lib/tarantool/box/sophia.so

debian/tarantool-sql-module.install

-usr/share/tarantool/1.5/box/net/sql.lua
+usr/share/tarantool/box/net/sql.lua

extra/rpm.spec.in

@@ -173,28 +173,28 @@ useradd -r -g tarantool tarantool > /dev/null 2>&1
 
 %files sql-module
 %defattr(-,root,root,-)
-%dir "%{_datadir}/tarantool/1.5"
-%dir "%{_datadir}/tarantool/1.5/box"
-%dir "%{_datadir}/tarantool/1.5/box/net"
-"%{_datadir}/tarantool/1.5/box/net/sql.lua"
+%dir "%{_datadir}/tarantool"
+%dir "%{_datadir}/tarantool/box"
+%dir "%{_datadir}/tarantool/box/net"
+"%{_datadir}/tarantool/box/net/sql.lua"
 
 %files pg-module
 %defattr(-,root,root,-)
-%dir "%{_libdir}/tarantool/1.5"
-%dir "%{_libdir}/tarantool/1.5/box"
-"%{_libdir}/tarantool/1.5/box/net/pg.so"
+%dir "%{_libdir}/tarantool/"
+%dir "%{_libdir}/tarantool/box"
+"%{_libdir}/tarantool/box/net/pg.so"
 
 %files mysql-module
 %defattr(-,root,root,-)
-%dir "%{_libdir}/tarantool/1.5"
-%dir "%{_libdir}/tarantool/1.5/box"
-"%{_libdir}/tarantool/1.5/box/net/mysql.so"
+%dir "%{_libdir}/tarantool"
+%dir "%{_libdir}/tarantool/box"
+"%{_libdir}/tarantool/box/net/mysql.so"
 
 %files sophia-module
 %defattr(-,root,root,-)
-%dir "%{_libdir}/tarantool/1.5"
-%dir "%{_libdir}/tarantool/1.5/box"
-"%{_libdir}/tarantool/1.5/box/sophia.so"
+%dir "%{_libdir}/tarantool"
+%dir "%{_libdir}/tarantool/box"
+"%{_libdir}/tarantool/box/sophia.so"
 
 %files dev
 %defattr(-,root,root,-)
@@ -244,14 +244,14 @@ useradd -r -g tarantool tarantool > /dev/null 2>&1
 "%{_libdir}/libtarantoolsql.so"
 "%{_libdir}/libtarantoolsql.so.1"
 "%{_libdir}/libtarantoolsql.so.1.1"
-%dir "%{_includedir}/tarantool/1.5"
-"%{_includedir}/tarantool/1.5/config.h"
-"%{_includedir}/tarantool/1.5/lauxlib.h"
-"%{_includedir}/tarantool/1.5/luaconf.h"
-"%{_includedir}/tarantool/1.5/lua.h"
-"%{_includedir}/tarantool/1.5/lua.hpp"
-"%{_includedir}/tarantool/1.5/luajit.h"
-"%{_includedir}/tarantool/1.5/lualib.h"
+%dir "%{_includedir}/tarantool"
+"%{_includedir}/tarantool/config.h"
+"%{_includedir}/tarantool/lauxlib.h"
+"%{_includedir}/tarantool/luaconf.h"
+"%{_includedir}/tarantool/lua.h"
+"%{_includedir}/tarantool/lua.hpp"
+"%{_includedir}/tarantool/luajit.h"
+"%{_includedir}/tarantool/lualib.h"
 
 %files client
 %defattr(-,root,root,-)

include/tarantool/config.h.cmake

@@ -129,9 +129,9 @@
 /*
  * Modules
  */
-#define MODULE_LIBDIR "@MODULE_LIBDIR@"
-#define MODULE_LUADIR "@MODULE_LUADIR@"
-#define MODULE_INCLUDEDIR "@MODULE_INCLUDEDIR@"
+#define MODULE_LIBDIR "@MODULE_FULL_LIBDIR@"
+#define MODULE_LUADIR "@MODULE_FULL_LUADIR@"
+#define MODULE_INCLUDEDIR "@MODULE_FULL_INCLUDEDIR@"
 #define MODULE_LUAPATH "@MODULE_LUAPATH@"
 #define MODULE_LIBPATH "@MODULE_LIBPATH@"