equal
deleted
inserted
replaced
510 |
510 |
511 if [ "$os" = "OSX" ] && [ "$with_application_bundle" = "1" ]; then |
511 if [ "$os" = "OSX" ] && [ "$with_application_bundle" = "1" ]; then |
512 OSXAPP="OpenTTD.app" |
512 OSXAPP="OpenTTD.app" |
513 |
513 |
514 # TODO: remove next few lines of code when the search path patch has been applied |
514 # TODO: remove next few lines of code when the search path patch has been applied |
515 if [ -n "$custom_lang_dir" ] && [ "$custom_lang_dir" != "$(OSXAPP)/Contents/Lang/" ]; then |
515 if [ -n "$custom_lang_dir" ] && [ "$custom_lang_dir" != "${OSXAPP}/Contents/Lang/" ]; then |
516 log 1 "configure: error: --custom-lang-dir and --with-application-bundle are not compatible |
516 log 1 "configure: error: --custom-lang-dir and --with-application-bundle are not compatible |
517 exit 1 |
517 exit 1 |
518 fi |
518 fi |
519 |
519 |
520 if [ -n "$custom_lang_dir" ] && [ "$second_data_dir" != "$(OSXAPP)/Contents/Data/" ]; then |
520 if [ -n "$custom_lang_dir" ] && [ "$second_data_dir" != "${OSXAPP}/Contents/Data/" ]; then |
521 log 1 "configure: error: --second-data-dir and --with-application-bundle are not compatible |
521 log 1 "configure: error: --second-data-dir and --with-application-bundle are not compatible |
522 exit 1 |
522 exit 1 |
523 fi |
523 fi |
524 |
524 |
525 custom_lang_dir="${OSXAPP}/Contents/Lang/" |
525 custom_lang_dir="${OSXAPP}/Contents/Lang/" |