package & install path fix

Author: Bamcane

CMakeLists.txt

@@ -1844,7 +1844,8 @@ if(TARGET_OS STREQUAL "windows")
 endif()
 
 if(NOT DEV)
-  install(DIRECTORY ${PROJECT_BINARY_DIR}/data DESTINATION share/${PROJECT_NAME} COMPONENT data)
+  install(DIRECTORY ${CPACK_DIRS} DESTINATION share/${PROJECT_NAME} COMPONENT data)
+  install(FILES ${CPACK_FILES} DESTINATION share/${PROJECT_NAME} COMPONENT data)
 
   set(EXTRA_ARGS DESTINATION . COMPONENT portable EXCLUDE_FROM_ALL)
   install(TARGETS ${CPACK_TARGETS} ${EXTRA_ARGS})
@@ -1864,8 +1865,7 @@ if(NOT DEV)
       MACOSX_BUNDLE_ICON_FILE "${PROJECT_SOURCE_DIR}/other/icons/${TARGET_SERVER}.icns"
     )
   else()
-    install(TARGETS ${TARGET_CLIENT} DESTINATION . COMPONENT Runtime)
-    install(TARGETS ${TARGET_SERVER} DESTINATION . COMPONENT Runtime)
+    install(TARGETS ${CPACK_TARGETS} DESTINATION bin COMPONENT Runtime)
   endif()
 
   set(FIXUP_BUNDLE_SCRIPT "${CMAKE_BINARY_DIR}/.install_deps.cmake")

src/engine/shared/storage.cpp

@@ -262,6 +262,13 @@ class CStorage : public IStorage
 		// 4) check for all default locations
 		{
 			const char *aDirs[] = {
+				"/usr/share/teeworlds-archive/data",
+				"/usr/share/games/teeworlds-archive/data",
+				"/usr/local/share/teeworlds-archive/data",
+				"/usr/local/share/games/teeworlds-archive/data",
+				"/usr/pkg/share/teeworlds-archive/data",
+				"/usr/pkg/share/games/teeworlds-archive/data",
+				"/opt/teeworlds-archive/data",
 				"/usr/share/teeworlds/data",
 				"/usr/share/games/teeworlds/data",
 				"/usr/local/share/teeworlds/data",