/[gentoo-x86]/games-simulation/openttd/files/install.patch
Gentoo

Contents of /games-simulation/openttd/files/install.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.1 - (show annotations) (download)
Thu Oct 23 04:29:56 2008 UTC (5 years, 6 months ago) by robbat2
Branch: MAIN
Version bump per bug 233929.
(Portage version: 2.2_rc12/cvs/Linux 2.6.27-rc6-00521-gcdbf87e x86_64)

1 Index: Makefile.in
2 ===================================================================
3 --- Makefile.in (revision 14474)
4 +++ Makefile.in (working copy)
5 @@ -28,6 +28,7 @@
6 INSTALL_ICON_THEME_DIR = "$(INSTALL_DIR)/$(ICON_THEME_DIR)"
7 INSTALL_DATA_DIR = "$(INSTALL_DIR)/"!!DATA_DIR!!
8 INSTALL_DOC_DIR = "$(INSTALL_DIR)/"!!DOC_DIR!!
9 +BINARY_NAME = !!BINARY_NAME!!
10 TTD = !!TTD!!
11 TTDS = $(SRC_DIRS:%=%/$(TTD))
12 OS = !!OS!!
13 Index: Makefile.bundle.in
14 ===================================================================
15 --- Makefile.bundle.in (revision 14474)
16 +++ Makefile.bundle.in (working copy)
17 @@ -139,35 +140,41 @@
18 $(Q)install -d "$(INSTALL_DATA_DIR)/data"
19 $(Q)install -d "$(INSTALL_DATA_DIR)/lang"
20 $(Q)install -d "$(INSTALL_DOC_DIR)"
21 - $(Q)install -m 755 "$(BUNDLE_DIR)/$(TTD)" "$(INSTALL_BINARY_DIR)"
22 +ifeq ($(TTD), openttd.exe)
23 + $(Q)install -m 755 "$(BUNDLE_DIR)/$(TTD)" "$(INSTALL_BINARY_DIR)/${BINARY_NAME}.exe"
24 +else
25 + $(Q)install -m 755 "$(BUNDLE_DIR)/$(TTD)" "$(INSTALL_BINARY_DIR)/${BINARY_NAME}"
26 +endif
27 $(Q)install -m 644 "$(BUNDLE_DIR)/lang/"* "$(INSTALL_DATA_DIR)/lang"
28 $(Q)install -m 644 "$(BUNDLE_DIR)/data/"* "$(INSTALL_DATA_DIR)/data"
29 $(Q)install -m 644 "$(BUNDLE_DIR)/docs/"* "$(INSTALL_DOC_DIR)"
30 - $(Q)install -m 644 "$(BUNDLE_DIR)/media/openttd.32.xpm" "$(INSTALL_ICON_DIR)"
31 + $(Q)install -m 644 "$(BUNDLE_DIR)/"*.txt "$(INSTALL_DOC_DIR)"
32 + $(Q)install -m 644 "$(BUNDLE_DIR)/COPYING" "$(INSTALL_DOC_DIR)"
33 + $(Q)install -m 644 "$(BUNDLE_DIR)/media/openttd.32.xpm" "$(INSTALL_ICON_DIR)/${BINARY_NAME}.32.xpm"
34 ifdef ICON_THEME_DIR
35 $(Q)install -d "$(INSTALL_ICON_THEME_DIR)"
36 $(Q)install -d "$(INSTALL_ICON_THEME_DIR)/16x16/apps"
37 - $(Q)install -m 644 "$(BUNDLE_DIR)/media/openttd.16.png" "$(INSTALL_ICON_THEME_DIR)/16x16/apps"
38 + $(Q)install -m 644 "$(BUNDLE_DIR)/media/openttd.16.png" "$(INSTALL_ICON_THEME_DIR)/16x16/apps/${BINARY_NAME}.png"
39 $(Q)install -d "$(INSTALL_ICON_THEME_DIR)/32x32/apps"
40 - $(Q)install -m 644 "$(BUNDLE_DIR)/media/openttd.32.png" "$(INSTALL_ICON_THEME_DIR)/32x32/apps"
41 + $(Q)install -m 644 "$(BUNDLE_DIR)/media/openttd.32.png" "$(INSTALL_ICON_THEME_DIR)/32x32/apps/${BINARY_NAME}.png"
42 $(Q)install -d "$(INSTALL_ICON_THEME_DIR)/48x48/apps"
43 - $(Q)install -m 644 "$(BUNDLE_DIR)/media/openttd.48.png" "$(INSTALL_ICON_THEME_DIR)/48x48/apps"
44 + $(Q)install -m 644 "$(BUNDLE_DIR)/media/openttd.48.png" "$(INSTALL_ICON_THEME_DIR)/48x48/apps/${BINARY_NAME}.png"
45 $(Q)install -d "$(INSTALL_ICON_THEME_DIR)/64x64/apps"
46 - $(Q)install -m 644 "$(BUNDLE_DIR)/media/openttd.64.png" "$(INSTALL_ICON_THEME_DIR)/64x64/apps"
47 + $(Q)install -m 644 "$(BUNDLE_DIR)/media/openttd.64.png" "$(INSTALL_ICON_THEME_DIR)/64x64/apps/${BINARY_NAME}.png"
48 $(Q)install -d "$(INSTALL_ICON_THEME_DIR)/128x128/apps"
49 - $(Q)install -m 644 "$(BUNDLE_DIR)/media/openttd.128.png" "$(INSTALL_ICON_THEME_DIR)/128x128/apps"
50 + $(Q)install -m 644 "$(BUNDLE_DIR)/media/openttd.128.png" "$(INSTALL_ICON_THEME_DIR)/128x128/apps/${BINARY_NAME}.png"
51 $(Q)install -d "$(INSTALL_ICON_THEME_DIR)/256x256/apps"
52 - $(Q)install -m 644 "$(BUNDLE_DIR)/media/openttd.256.png" "$(INSTALL_ICON_THEME_DIR)/256x256/apps"
53 + $(Q)install -m 644 "$(BUNDLE_DIR)/media/openttd.256.png" "$(INSTALL_ICON_THEME_DIR)/256x256/apps/${BINARY_NAME}.png"
54 else
55 $(Q)install -m 644 "$(BUNDLE_DIR)/media/"*.png "$(INSTALL_ICON_DIR)"
56 endif
57 ifdef MAN_DIR
58 $(Q)install -d "$(INSTALL_MAN_DIR)"
59 - $(Q)install -m 644 "$(BUNDLE_DIR)/man/openttd.6.gz" "$(INSTALL_MAN_DIR)"
60 + $(Q)install -m 644 "$(BUNDLE_DIR)/man/openttd.6.gz" "$(INSTALL_MAN_DIR)/${BINARY_NAME}.6.gz"
61 endif
62 ifdef MENU_DIR
63 $(Q)install -d "$(INSTALL_MENU_DIR)"
64 - $(Q)install -m 644 "$(BUNDLE_DIR)/media/openttd.desktop" "$(INSTALL_MENU_DIR)"
65 + $(Q)install -m 644 "$(BUNDLE_DIR)/media/openttd.desktop" "$(INSTALL_MENU_DIR)/${BINARY_NAME}.desktop"
66 endif
67 $(Q)cp -R "$(BUNDLE_DIR)/scenario" "$(INSTALL_DATA_DIR)"
68 endif # OSXAPP
69 Index: config.lib
70 ===================================================================
71 --- config.lib (revision 14474)
72 +++ config.lib (working copy)
73 @@ -37,6 +37,7 @@
74 man_dir="1"
75 menu_dir="1"
76 menu_group="Game;"
77 + binary_name="openttd"
78 enable_debug="0"
79 enable_desync_debug="0"
80 enable_profiling="0"
81 @@ -100,6 +101,7 @@
82 shared_dir
83 install_dir
84 menu_group
85 + binary_name
86 enable_debug
87 enable_desync_debug
88 enable_profiling
89 @@ -213,6 +215,9 @@
90 --menu-dir=*) menu_dir="$optarg";;
91 --without-menu-entry) menu_dir="";;
92
93 + --binary-name) prevp_p="binary_name";;
94 + --binary-name=*) binary_name="$optarg";;
95 +
96 --man-dir) prevp_p="man_dir";;
97 --man-dir=*) man_dir="$optarg";;
98
99 @@ -2298,6 +2303,7 @@
100 s#!!PERSONAL_DIR!!#$personal_dir#g;
101 s#!!SHARED_DIR!!#$shared_dir#g;
102 s#!!INSTALL_DIR!!#$install_dir#g;
103 + s#!!BINARY_NAME!!#$binary_name#g;
104 s#!!STRGEN!!#$STRGEN#g;
105 s#!!ENDIAN_CHECK!!#$ENDIAN_CHECK#g;
106 s#!!ENDIAN_FORCE!!#$endian#g;
107 @@ -2507,6 +2513,8 @@
108 echo " [$shared_dir]"
109 echo " --install-dir=dir specifies the root to install to."
110 echo " Useful to install into jails [$install_dir]"
111 + echo " --binary-name the name used for the binary, icons,"
112 + echo " desktop file, etc. when installing [openttd]"
113 echo ""
114 echo "Features and packages:"
115 echo " --enable-debug[=LVL] enable debug-mode (LVL=[0123], 0 is release)"

  ViewVC Help
Powered by ViewVC 1.1.20