Mercurial > hg > openttd
changeset 11893:cdeafc1a92f6 draft
(svn r16293) -Fix: more uses of # in seds, which can cause trouble according to FS#2350.
| author | rubidium <rubidium@openttd.org> |
|---|---|
| date | Wed, 13 May 2009 12:54:46 +0000 |
| parents | 44ee3c88f4f0 |
| children | f4687a836df1 |
| files | config.lib |
| diffstat | 1 files changed, 7 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/config.lib +++ b/config.lib @@ -1412,7 +1412,7 @@ # 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 @@ 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 }