| 1 |
mr_bones_ 09/04/02 18:14:03 |
| 2 |
|
| 3 |
Added: openttd-0.7.0-build.patch |
| 4 |
Log: |
| 5 |
version bump - ebuild and patch submitted by scarabeus |
| 6 |
(Portage version: 2.1.6.7/cvs/Linux i686) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 games-simulation/openttd/files/openttd-0.7.0-build.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-simulation/openttd/files/openttd-0.7.0-build.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-simulation/openttd/files/openttd-0.7.0-build.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: openttd-0.7.0-build.patch |
| 15 |
=================================================================== |
| 16 |
--- config.lib 2009-04-01 16:36:05.000000000 +0200 |
| 17 |
+++ config.lib.new 2009-04-02 13:08:50.000000000 +0200 |
| 18 |
@@ -1389,7 +1389,8 @@ |
| 19 |
CFLAGS="$CFLAGS -DWITH_SHARED_DIR -DSHARED_DIR=\\\\\"$shared_dir\\\\\"" |
| 20 |
fi |
| 21 |
|
| 22 |
- CFLAGS="$CFLAGS -DGLOBAL_DATA_DIR=\\\\\"$prefix_dir/$data_dir\\\\\"" |
| 23 |
+ [[ $data_dir = "/"* ]] || data_dir="$prefix_dir/$data_dir" |
| 24 |
+ CFLAGS="$CFLAGS -DGLOBAL_DATA_DIR=\\\\\"$data_dir\\\\\"" |
| 25 |
|
| 26 |
log 1 "using CFLAGS... $CFLAGS $CC_CFLAGS" |
| 27 |
log 1 "using LDFLAGS... $LIBS $LDFLAGS" |
| 28 |
@@ -2532,6 +2533,16 @@ |
| 29 |
|
| 30 |
SRC_OBJS_DIR="$BASE_SRC_OBJS_DIR/$OBJS_SUBDIR" |
| 31 |
|
| 32 |
+ # we have to replace all prefix/x_dir with x_dir |
| 33 |
+ # and append prefix only when needed |
| 34 |
+ [[ $data_dir = "/"* ]] || data_dir="$prefix_dir/$data_dir" |
| 35 |
+ [[ $binary_dir = "/"* ]] || binary_dir="$prefix_dir/$binary_dir" |
| 36 |
+ [[ $doc_dir = "/"* ]] || doc_dir="$prefix_dir/$doc_dir" |
| 37 |
+ [[ $man_dir = "/"* ]] || man_dir="$prefix_dir/$man_dir" |
| 38 |
+ [[ $icon_dir = "/"* ]] || icon_dir="$prefix_dir/$icon_dir" |
| 39 |
+ [[ $icon_theme_dir = "/"* ]] || icon_theme_dir="$prefix_dir/$icon_theme_dir" |
| 40 |
+ [[ $menu_dir = "/"* ]] || menu_dir="$prefix_dir/$menu_dir" |
| 41 |
+ |
| 42 |
# All the data needed to compile a single target |
| 43 |
# Make sure if you compile multiple targets to |
| 44 |
# use multiple OBJS_DIR, because all in-between |
| 45 |
@@ -2561,12 +2572,12 @@ |
| 46 |
s~!!OSXAPP!!~$OSXAPP~g; |
| 47 |
s~!!LANG_DIR!!~$LANG_DIR~g; |
| 48 |
s~!!TTD!!~$TTD~g; |
| 49 |
- s~!!BINARY_DIR!!~$prefix_dir/$binary_dir~g; |
| 50 |
- s~!!DATA_DIR!!~$prefix_dir/$data_dir~g; |
| 51 |
- s~!!DOC_DIR!!~$prefix_dir/$doc_dir~g; |
| 52 |
- s~!!MAN_DIR!!~$prefix_dir/$man_dir~g; |
| 53 |
- s~!!ICON_DIR!!~$prefix_dir/$icon_dir~g; |
| 54 |
- s~!!ICON_THEME_DIR!!~$prefix_dir/$icon_theme_dir~g; |
| 55 |
+ s~!!BINARY_DIR!!~$binary_dir~g; |
| 56 |
+ s~!!DATA_DIR!!~$data_dir~g; |
| 57 |
+ s~!!DOC_DIR!!~$doc_dir~g; |
| 58 |
+ s~!!MAN_DIR!!~$man_dir~g; |
| 59 |
+ s~!!ICON_DIR!!~$icon_dir~g; |
| 60 |
+ s~!!ICON_THEME_DIR!!~$icon_theme_dir~g; |
| 61 |
s~!!PERSONAL_DIR!!~$personal_dir~g; |
| 62 |
s~!!SHARED_DIR!!~$shared_dir~g; |
| 63 |
s~!!INSTALL_DIR!!~$install_dir~g; |
| 64 |
@@ -2601,7 +2612,7 @@ |
| 65 |
|
| 66 |
if [ "$icon_theme_dir" != "" ]; then |
| 67 |
SRC_REPLACE="$SRC_REPLACE |
| 68 |
- s#!!ICON_THEME_DIR!!#$prefix_dir/$icon_theme_dir#g; |
| 69 |
+ s#!!ICON_THEME_DIR!!#$icon_theme_dir#g; |
| 70 |
" |
| 71 |
else |
| 72 |
SRC_REPLACE="$SRC_REPLACE |
| 73 |
@@ -2611,7 +2622,7 @@ |
| 74 |
|
| 75 |
if [ "$man_dir" != "" ]; then |
| 76 |
SRC_REPLACE="$SRC_REPLACE |
| 77 |
- s#!!MAN_DIR!!#$prefix_dir/$man_dir#g; |
| 78 |
+ s#!!MAN_DIR!!#$man_dir#g; |
| 79 |
" |
| 80 |
else |
| 81 |
SRC_REPLACE="$SRC_REPLACE |
| 82 |
@@ -2621,7 +2632,7 @@ |
| 83 |
|
| 84 |
if [ "$menu_dir" != "" ]; then |
| 85 |
SRC_REPLACE="$SRC_REPLACE |
| 86 |
- s#!!MENU_DIR!!#$prefix_dir/$menu_dir#g; |
| 87 |
+ s#!!MENU_DIR!!#$menu_dir#g; |
| 88 |
" |
| 89 |
else |
| 90 |
SRC_REPLACE="$SRC_REPLACE |
Archives