Gentoo Archives: gentoo-commits

From: "Julian Ospald (hasufell)" <hasufell@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in games-rpg/zsxd/files: zsxd-1.7.1-paths.patch
Date: Wed, 29 Jan 2014 20:20:40
Message-Id: 20140129202034.ACE0F2004E@flycatcher.gentoo.org
1 hasufell 14/01/29 20:20:34
2
3 Added: zsxd-1.7.1-paths.patch
4 Log:
5 initial import
6
7 (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key E73C35B3)
8
9 Revision Changes Path
10 1.1 games-rpg/zsxd/files/zsxd-1.7.1-paths.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-rpg/zsxd/files/zsxd-1.7.1-paths.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-rpg/zsxd/files/zsxd-1.7.1-paths.patch?rev=1.1&content-type=text/plain
14
15 Index: zsxd-1.7.1-paths.patch
16 ===================================================================
17 From: Julian Ospald <hasufell@g.o>
18 Date: Wed Jan 29 13:23:26 UTC 2014
19 Subject: make paths modifiable
20
21 --- zsxd-1.7.1/CMakeLists.txt
22 +++ zsxd-1.7.1/CMakeLists.txt
23 @@ -3,6 +3,10 @@
24
25 set(quest_name "zsxd")
26
27 +set(DATAROOTDIR "share" CACHE PATH "dataroot dir")
28 +set(DATADIR "${DATAROOTDIR}/solarus" CACHE PATH "data dir")
29 +set(BINDIR "bin" CACHE PATH "bin dir")
30 +
31 # data files list
32 file(GLOB_RECURSE data_files
33 RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/data
34 @@ -47,7 +51,7 @@
35 add_custom_command(
36 OUTPUT ${quest_name}
37 COMMAND echo '\#!/bin/sh' > ${quest_name}
38 - COMMAND echo 'solarus ${CMAKE_INSTALL_PREFIX}/share/solarus/${quest_name} $*' >> ${quest_name}
39 + COMMAND echo 'solarus ${DATADIR}/${quest_name} $*' >> ${quest_name}
40 )
41 add_custom_target(${quest_name}_command
42 ALL
43 @@ -56,11 +60,11 @@
44
45 # install the data archive
46 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/data.solarus
47 - DESTINATION share/solarus/${quest_name}
48 + DESTINATION ${DATADIR}/${quest_name}
49 )
50
51 # install the script
52 install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${quest_name}
53 - DESTINATION bin
54 + DESTINATION ${BINDIR}
55 )