--- a/Makefile.in	Mon Mar 19 09:33:17 2007 +0000
+++ b/Makefile.in	Mon Mar 19 12:38:16 2007 +0000
@@ -94,7 +94,10 @@
 	done
 
 run: all
-	$(Q)cd !!BIN_DIR!! && ./!!TTD!!
+	$(Q)cd !!BIN_DIR!! && ./!!TTD!! $(OPENTTD_ARGS)
+
+run-gdb: all
+	$(Q)cd !!BIN_DIR!! && gdb --ex run --args ./!!TTD!! $(OPENTTD_ARGS)
 
 %.o:
 	@for dir in $(SRC_DIRS); do \
@@ -133,8 +136,8 @@
 
 # An OSX application bundle needs the data files, lang files and openttd executable in a different location.
 ifdef OSXAPP
-DATA_DIR = $(BUNDLE_DIR)/$(OSXAPP)/Contents/Data
-LANG_DIR = $(BUNDLE_DIR)/$(OSXAPP)/Contents/Lang
+DATA_DIR = $(BUNDLE_DIR)/$(OSXAPP)/Contents/Resources/data
+LANG_DIR = $(BUNDLE_DIR)/$(OSXAPP)/Contents/Resources/lang
 TTD_DIR  = $(BUNDLE_DIR)/$(OSXAPP)/Contents/MacOS
 else
 DATA_DIR = $(BUNDLE_DIR)/data