From: Perttu Ahola <celeron55@gmail.com>
Date: Mon, 28 Nov 2011 19:14:55 +0000 (+0200)
Subject: Update installation in CMakeLists.txt
X-Git-Tag: 0.4.dev-20111201-0~34
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a91eb362777152b21dcd2c49788c1b5714f8792e;p=oweals%2Fminetest.git

Update installation in CMakeLists.txt
---

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8c966a690..b714e89f1 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -302,13 +302,15 @@ endif()
 #
 
 # Example configuration file
-install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/../minetest.conf.example" DESTINATION ${EXAMPLE_CONF_DIR})
+# NOTE: Install is handled elsewhere
+#install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/../minetest.conf.example" DESTINATION ${EXAMPLE_CONF_DIR})
 
 if(BUILD_CLIENT)
 	install(TARGETS ${PROJECT_NAME} DESTINATION ${BINDIR})
 
-	file(GLOB images "${CMAKE_CURRENT_SOURCE_DIR}/../data/textures/*.png")
-	install(FILES ${images} DESTINATION ${DATADIR}/textures)
+	#file(GLOB images "${CMAKE_CURRENT_SOURCE_DIR}/../data/textures/*.png")
+	#install(FILES ${images} DESTINATION ${DATADIR}/textures)
+	install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../data" DESTINATION ${DATADIR})
 
 	if(USE_GETTEXT)
 		foreach(LOCALE ${GETTEXT_AVAILABLE_LOCALES})