diff options
| author | rubidium <rubidium@openttd.org> | 2009-05-13 12:54:46 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2009-05-13 12:54:46 +0000 |
| commit | 46928b9d725e17bc54e02beec459316e98d8e05d (patch) | |
| tree | a39f4671855462c437e058556a73a706f6d593f3 | |
| parent | 67723e42aaea5cd208aec49a2aec7915310a8692 (diff) | |
| download | openttd-46928b9d725e17bc54e02beec459316e98d8e05d.tar.xz | |
(svn r16293) -Fix: more uses of # in seds, which can cause trouble according to FS#2350.
| -rw-r--r-- | config.lib | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/config.lib b/config.lib index 3089d0837..d4a184a83 100644 --- a/config.lib +++ b/config.lib @@ -1412,7 +1412,7 @@ make_cflags_and_ldflags() { # not something we can control. # Also make makedepend aware of compiler's built-in defines. if [ "$with_makedepend" != "0" ]; then - cflags_makedep="`echo | $cxx_host -E -x c++ -dM - | sed 's~#define ~-D~g;s~ .*~ ~g;s~(.*)~~g' | tr -d '\r\n'`" + cflags_makedep="`echo | $cxx_host -E -x c++ -dM - | sed 's~.define ~-D~g;s~ .*~ ~g;s~(.*)~~g' | tr -d '\r\n'`" cflags_makedep="$cflags_makedep `echo "$CFLAGS" | sed 's~ /~ -~g;s~-I[ ]*[^ ]*~~g'`" else makedepend="" @@ -2619,31 +2619,31 @@ make_sed() { if [ "$icon_theme_dir" != "" ]; then SRC_REPLACE="$SRC_REPLACE - s#!!ICON_THEME_DIR!!#$prefix_dir/$icon_theme_dir#g; + s~!!ICON_THEME_DIR!!~$prefix_dir/$icon_theme_dir~g; " else SRC_REPLACE="$SRC_REPLACE - s#!!ICON_THEME_DIR!!##g; + s~!!ICON_THEME_DIR!!~~g; " fi if [ "$man_dir" != "" ]; then SRC_REPLACE="$SRC_REPLACE - s#!!MAN_DIR!!#$prefix_dir/$man_dir#g; + s~!!MAN_DIR!!~$prefix_dir/$man_dir~g; " else SRC_REPLACE="$SRC_REPLACE - s#!!MAN_DIR!!##g; + s~!!MAN_DIR!!~~g; " fi if [ "$menu_dir" != "" ]; then SRC_REPLACE="$SRC_REPLACE - s#!!MENU_DIR!!#$prefix_dir/$menu_dir#g; + s~!!MENU_DIR!!~$prefix_dir/$menu_dir~g; " else SRC_REPLACE="$SRC_REPLACE - s#!!MENU_DIR!!##g; + s~!!MENU_DIR!!~~g; " fi } |