388 echo "" >> $config_log |
388 echo "" >> $config_log |
389 |
389 |
390 configure="$CONFIGURE_EXECUTABLE --ignore-extra-parameters" |
390 configure="$CONFIGURE_EXECUTABLE --ignore-extra-parameters" |
391 for p in $save_params_array; do |
391 for p in $save_params_array; do |
392 eval "v=\"\$$p\"" |
392 eval "v=\"\$$p\"" |
393 p=`echo "$p" | sed 's/_/-/g;s/\n//g;s/ /\\ /g'` |
393 p=`echo "$p" | sed 's#_#-#g;s#\n##g;s# #\\ #g'` |
394 # Only save those params that aren't empty |
394 # Only save those params that aren't empty |
395 configure="$configure --$p=\"$v\"" |
395 configure="$configure --$p=\"$v\"" |
396 done |
396 done |
397 |
397 |
398 echo "$configure" >> $config_log |
398 echo "$configure" >> $config_log |
844 doc_dir="share/doc/openttd" |
844 doc_dir="share/doc/openttd" |
845 else |
845 else |
846 doc_dir="$data_dir/docs" |
846 doc_dir="$data_dir/docs" |
847 fi |
847 fi |
848 else |
848 else |
849 doc_dir="`echo $doc_dir | sed 's/\([^\]\)\\\\ /\1\\\\\\\\ /g;s/\([^\]\) /\1\\\\\\\\ /g'`" |
849 doc_dir="`echo $doc_dir | sed 's#\([^\]\)\\\\ #\1\\\\\\\\ #g;s#\([^\]\) #\1\\\\\\\\ #g'`" |
850 fi |
850 fi |
851 |
851 |
852 if [ "$icon_theme_dir" = "1" ]; then |
852 if [ "$icon_theme_dir" = "1" ]; then |
853 if [ "$os" = "UNIX" ] || [ "$os" = "FREEBSD" ] || [ "$os" = "OPENBSD" ] || [ "$os" = "NETBSD" ] || [ "$os" = "HPUX" ] || [ "$os" = "SUNOS" ]; then |
853 if [ "$os" = "UNIX" ] || [ "$os" = "FREEBSD" ] || [ "$os" = "OPENBSD" ] || [ "$os" = "NETBSD" ] || [ "$os" = "HPUX" ] || [ "$os" = "SUNOS" ]; then |
854 icon_theme_dir="share/icons/hicolor" |
854 icon_theme_dir="share/icons/hicolor" |
855 else |
855 else |
856 icon_theme_dir="" |
856 icon_theme_dir="" |
857 fi |
857 fi |
858 else |
858 else |
859 icon_theme_dir="`echo $icon_theme_dir | sed 's/\([^\]\)\\\\ /\1\\\\\\\\ /g;s/\([^\]\) /\1\\\\\\\\ /g'`" |
859 icon_theme_dir="`echo $icon_theme_dir | sed 's#\([^\]\)\\\\ #\1\\\\\\\\ #g;s#\([^\]\) #\1\\\\\\\\ #g'`" |
860 fi |
860 fi |
861 |
861 |
862 if [ "$personal_dir" = "1" ]; then |
862 if [ "$personal_dir" = "1" ]; then |
863 if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ] || [ "$os" = "WINCE" ]; then |
863 if [ "$os" = "MINGW" ] || [ "$os" = "CYGWIN" ] || [ "$os" = "WINCE" ]; then |
864 personal_dir="OpenTTD" |
864 personal_dir="OpenTTD" |
866 personal_dir="Documents/OpenTTD" |
866 personal_dir="Documents/OpenTTD" |
867 else |
867 else |
868 personal_dir=".openttd" |
868 personal_dir=".openttd" |
869 fi |
869 fi |
870 else |
870 else |
871 personal_dir="`echo $personal_dir | sed 's/\([^\]\)\\\\ /\1\\\\\\\\ /g;s/\([^\]\) /\1\\\\\\\\ /g'`" |
871 personal_dir="`echo $personal_dir | sed 's#\([^\]\)\\\\ #\1\\\\\\\\ #g;s#\([^\]\) #\1\\\\\\\\ #g'`" |
872 fi |
872 fi |
873 |
873 |
874 if [ "$shared_dir" = "1" ]; then |
874 if [ "$shared_dir" = "1" ]; then |
875 # we are using default values |
875 # we are using default values |
876 if [ "$os" = "OSX" ]; then |
876 if [ "$os" = "OSX" ]; then |
877 shared_dir="/Library/Application\\\\ Support/OpenTTD" |
877 shared_dir="/Library/Application\\\\ Support/OpenTTD" |
878 else |
878 else |
879 shared_dir="" |
879 shared_dir="" |
880 fi |
880 fi |
881 else |
881 else |
882 shared_dir="`echo $shared_dir | sed 's/\([^\]\)\\\\ /\1\\\\\\\\ /g;s/\([^\]\) /\1\\\\\\\\ /g'`" |
882 shared_dir="`echo $shared_dir | sed 's#\([^\]\)\\\\ #\1\\\\\\\\ #g;s#\([^\]\) #\1\\\\\\\\ #g'`" |
883 fi |
883 fi |
884 |
884 |
885 if [ "$man_dir" = "1" ]; then |
885 if [ "$man_dir" = "1" ]; then |
886 # add manpage on UNIX systems |
886 # add manpage on UNIX systems |
887 if [ "$os" = "UNIX" ] || [ "$os" = "FREEBSD" ] || [ "$os" = "OPENBSD" ] || [ "$os" = "NETBSD" ] || [ "$os" = "HPUX" ] || [ "$os" = "SUNOS" ] || [ "$os" = "OSX" ]; then |
887 if [ "$os" = "UNIX" ] || [ "$os" = "FREEBSD" ] || [ "$os" = "OPENBSD" ] || [ "$os" = "NETBSD" ] || [ "$os" = "HPUX" ] || [ "$os" = "SUNOS" ] || [ "$os" = "OSX" ]; then |
888 man_dir="share/man/man6" |
888 man_dir="share/man/man6" |
889 else |
889 else |
890 man_dir="" |
890 man_dir="" |
891 fi |
891 fi |
892 else |
892 else |
893 man_dir="`echo $man_dir | sed 's/\([^\]\)\\\\ /\1\\\\\\\\ /g;s/\([^\]\) /\1\\\\\\\\ /g'`" |
893 man_dir="`echo $man_dir | sed 's#\([^\]\)\\\\ #\1\\\\\\\\ #g;s#\([^\]\) #\1\\\\\\\\ #g'`" |
894 fi |
894 fi |
895 |
895 |
896 if [ "$menu_dir" = "1" ]; then |
896 if [ "$menu_dir" = "1" ]; then |
897 # add a freedesktop menu item only for some UNIX systems |
897 # add a freedesktop menu item only for some UNIX systems |
898 if [ "$os" = "UNIX" ] || [ "$os" = "FREEBSD" ] || [ "$os" = "OPENBSD" ] || [ "$os" = "NETBSD" ] || [ "$os" = "HPUX" ] || [ "$os" = "SUNOS" ]; then |
898 if [ "$os" = "UNIX" ] || [ "$os" = "FREEBSD" ] || [ "$os" = "OPENBSD" ] || [ "$os" = "NETBSD" ] || [ "$os" = "HPUX" ] || [ "$os" = "SUNOS" ]; then |
899 menu_dir="share/applications" |
899 menu_dir="share/applications" |
900 else |
900 else |
901 menu_dir="" |
901 menu_dir="" |
902 fi |
902 fi |
903 else |
903 else |
904 menu_dir="`echo $menu_dir | sed 's/\([^\]\)\\\\ /\1\\\\\\\\ /g;s/\([^\]\) /\1\\\\\\\\ /g'`" |
904 menu_dir="`echo $menu_dir | sed 's#\([^\]\)\\\\ #\1\\\\\\\\ #g;s#\([^\]\) #\1\\\\\\\\ #g'`" |
905 fi |
905 fi |
906 |
906 |
907 # "set_universal_binary_flags" needs to be before "detect_iconv" |
907 # "set_universal_binary_flags" needs to be before "detect_iconv" |
908 set_universal_binary_flags |
908 set_universal_binary_flags |
909 detect_iconv |
909 detect_iconv |
1190 |
1190 |
1191 if [ "$enable_static" != "0" ]; then |
1191 if [ "$enable_static" != "0" ]; then |
1192 if [ "$os" = "OSX" ]; then |
1192 if [ "$os" = "OSX" ]; then |
1193 # fontconfig_config goes via pkg-config on all systems, which doesn't know --prefix |
1193 # fontconfig_config goes via pkg-config on all systems, which doesn't know --prefix |
1194 # Also, despite the reason we link to the .a file ourself (because we can't use -static), we do need to ask pkg-config about possible other deps |
1194 # Also, despite the reason we link to the .a file ourself (because we can't use -static), we do need to ask pkg-config about possible other deps |
1195 LIBS="$LIBS `$fontconfig_config --variable=prefix`/lib/libfontconfig.a `$fontconfig_config --libs --static | sed s/-lfontconfig//`" |
1195 LIBS="$LIBS `$fontconfig_config --variable=prefix`/lib/libfontconfig.a `$fontconfig_config --libs --static | sed s#-lfontconfig##`" |
1196 else |
1196 else |
1197 LIBS="$LIBS `$fontconfig_config --libs --static | tr '\n\r' ' '`" |
1197 LIBS="$LIBS `$fontconfig_config --libs --static | tr '\n\r' ' '`" |
1198 fi |
1198 fi |
1199 else |
1199 else |
1200 LIBS="$LIBS `$fontconfig_config --libs | tr '\n\r' ' '`" |
1200 LIBS="$LIBS `$fontconfig_config --libs | tr '\n\r' ' '`" |