Skip to content
Snippets Groups Projects
Commit d5ed42be authored by Konstantin Osipov's avatar Konstantin Osipov
Browse files

Fix broken 'make install' target.

The bootstrap snap (000000000000000001.snap) moved to src/.
It was removed from test/box/. Fix the install target,
add a RENAME option to correctly install the file.
parent ee6518e4
No related branches found
No related tags found
No related merge requests found
...@@ -16,12 +16,14 @@ if (ENABLE_RPM) ...@@ -16,12 +16,14 @@ if (ENABLE_RPM)
install (FILES ${CMAKE_SOURCE_DIR}/test/share/tarantool_rpm.cfg install (FILES ${CMAKE_SOURCE_DIR}/test/share/tarantool_rpm.cfg
DESTINATION ${CMAKE_SYSCONF_DIR}/tarantool/ DESTINATION ${CMAKE_SYSCONF_DIR}/tarantool/
RENAME "tarantool.cfg") RENAME "tarantool.cfg")
install (FILES ${CMAKE_SOURCE_DIR}/test/box/00000000000000000001.snap install (FILES ${CMAKE_SOURCE_DIR}/src/bootstrap.snap
DESTINATION share/tarantool) DESTINATION share/tarantool
RENAME 00000000000000000001.snap)
else() else()
install (FILES ${CMAKE_SOURCE_DIR}/test/share/tarantool_tgz.cfg install (FILES ${CMAKE_SOURCE_DIR}/test/share/tarantool_tgz.cfg
DESTINATION "${CMAKE_SYSCONF_DIR}" DESTINATION "${CMAKE_SYSCONF_DIR}"
RENAME "tarantool.cfg") RENAME "tarantool.cfg")
install (FILES ${CMAKE_SOURCE_DIR}/test/box/00000000000000000001.snap install (FILES ${CMAKE_SOURCE_DIR}/src/bootstrap.snap
DESTINATION "${CMAKE_LOCALSTATE_DIR}/lib/tarantool") DESTINATION "${CMAKE_LOCALSTATE_DIR}/lib/tarantool"
RENAME 00000000000000000001.snap)
endif() endif()
...@@ -34,12 +34,3 @@ admin_port = 33015 ...@@ -34,12 +34,3 @@ admin_port = 33015
# When the limit is reached, Tarantool closes # When the limit is reached, Tarantool closes
# the WAL and starts a new one. # the WAL and starts a new one.
rows_per_wal = 50000 rows_per_wal = 50000
#
# Define a simple space with 1 HASH-based
# primary key.
space[0].enabled = 1
space[0].index[0].type = "HASH"
space[0].index[0].unique = 1
space[0].index[0].key_field[0].fieldno = 0
space[0].index[0].key_field[0].type = "NUM"
...@@ -31,12 +31,3 @@ admin_port = 33015 ...@@ -31,12 +31,3 @@ admin_port = 33015
# When the limit is reached, Tarantool closes # When the limit is reached, Tarantool closes
# the WAL and starts a new one. # the WAL and starts a new one.
rows_per_wal = 50000 rows_per_wal = 50000
#
# Define a simple space with 1 HASH-based
# primary key.
space[0].enabled = 1
space[0].index[0].type = "HASH"
space[0].index[0].unique = 1
space[0].index[0].key_field[0].fieldno = 0
space[0].index[0].key_field[0].type = "NUM"
...@@ -35,15 +35,5 @@ admin_port = 33015 ...@@ -35,15 +35,5 @@ admin_port = 33015
# the WAL and starts a new one. # the WAL and starts a new one.
rows_per_wal = 50000 rows_per_wal = 50000
#
# Define a simple space with 1 HASH-based
# primary key.
space[0].enabled = 1
space[0].index[0].type = "HASH"
space[0].index[0].unique = 1
space[0].index[0].key_field[0].fieldno = 0
space[0].index[0].key_field[0].type = "NUM"
#
# working directory (daemon will chdir(2) to it) # working directory (daemon will chdir(2) to it)
work_dir = "var/lib/tarantool" work_dir = "var/lib/tarantool"
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment