diff options
| author | Perttu Ahola <celeron55@gmail.com> | 2011-07-23 19:04:37 +0300 |
|---|---|---|
| committer | Perttu Ahola <celeron55@gmail.com> | 2011-07-23 19:04:37 +0300 |
| commit | 2587bb361cfc96b3a695d1476e39b9c0ecaa6553 (patch) | |
| tree | 6e6a35e0ee35883201189df9c545cc44b7a06658 /CMakeLists.txt | |
| parent | 90d793f8f369bf1431d7a915198cd49b98bbe2d7 (diff) | |
| parent | 976ec31c1faedc3a34935c3aafd6a868e222d1ad (diff) | |
| download | minetest-2587bb361cfc96b3a695d1476e39b9c0ecaa6553.tar.gz minetest-2587bb361cfc96b3a695d1476e39b9c0ecaa6553.tar.bz2 minetest-2587bb361cfc96b3a695d1476e39b9c0ecaa6553.zip | |
merged the content type extension and delta
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 6403a9dd9..aae390f38 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,11 +5,11 @@ if(${CMAKE_VERSION} STREQUAL "2.8.2") endif(${CMAKE_VERSION} STREQUAL "2.8.2") # This can be read from ${PROJECT_NAME} after project() is called -project(minetest) +project(minetest-delta) set(VERSION_MAJOR 0) set(VERSION_MINOR 2) -set(VERSION_PATCH 20110704_0) +set(VERSION_PATCH 20110720_0) set(VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}") # Configuration options @@ -48,18 +48,18 @@ if(WIN32) set(EXAMPLE_CONF_DIR ".") elseif(APPLE) # random placeholders - set(DATADIR "share/minetest") + set(DATADIR "share/${PROJECT_NAME}") set(BINDIR "bin") - set(DOCDIR "share/doc/minetest") + set(DOCDIR "share/doc/${PROJECT_NAME}") set(EXAMPLE_CONF_DIR ".") elseif(UNIX) # Linux, BSD etc - set(DATADIR "share/minetest") + set(DATADIR "share/${PROJECT_NAME}") set(BINDIR "bin") - set(DOCDIR "share/doc/minetest") - set(EXAMPLE_CONF_DIR "share/doc/minetest") + set(DOCDIR "share/doc/${PROJECT_NAME}") + set(EXAMPLE_CONF_DIR "share/doc/${PROJECT_NAME}") endif() -install(FILES "README.txt" DESTINATION "${DOCDIR}") +install(FILES "doc/README.txt" DESTINATION "${DOCDIR}") install(FILES "minetest.conf.example" DESTINATION "${DOCDIR}") # @@ -103,8 +103,8 @@ elseif(APPLE) set(CPACK_BUNDLE_NAME ${PROJECT_NAME}) set(CPACK_BUNDLE_ICON "") set(CPACK_BUNDLE_PLIST "") - set(CPACK_BUNDLE_STARTUP_COMMAND "Contents/MacOS/minetest") - set(CPACK_GENERATOR Bundle) + set(CPACK_BUNDLE_STARTUP_COMMAND "Contents/MacOS/${PROJECT_NAME}") + set(CPACK_GENERATOR "Bundle") else() set(CPACK_PACKAGE_FILE_NAME "${PROJECT_NAME}-${VERSION_STRING}-linux") set(CPACK_GENERATOR TGZ) |