# HG changeset patch
# User rubidium <rubidium@openttd.org>
# Date 2009-03-04 23:46:47
# Node ID 6f8c2af5547893d52ff053e7d75e532fc9b5a227
# Parent  dfe9dcd54165b67c7d4100cdbd54ce85ab991620

(svn r15618) -Cleanup: remove unneeded (empty) scenario directory.
Note: as you might know subversion has the tendency to also remove unversioned files when a directory is removed, so scenarios and heightmaps in that directory will be gone too.

diff --git a/Makefile.bundle.in b/Makefile.bundle.in
--- a/Makefile.bundle.in
+++ b/Makefile.bundle.in
@@ -36,8 +36,6 @@ bundle: all
 	$(Q)rm -rf   "$(BUNDLE_DIR)"
 	$(Q)mkdir -p "$(BUNDLE_DIR)"
 	$(Q)mkdir -p "$(BUNDLE_DIR)/docs"
-	$(Q)mkdir -p "$(BUNDLE_DIR)/scenario"
-	$(Q)mkdir -p "$(BUNDLE_DIR)/scenario/heightmap"
 	$(Q)mkdir -p "$(BUNDLE_DIR)/media"
 	$(Q)mkdir -p "$(BUNDLE_DIR)/scripts"
 	$(Q)mkdir -p "$(TTD_DIR)"
@@ -75,12 +73,6 @@ ifdef MENU_DIR
 	$(Q)cp "$(ROOT_DIR)/media/openttd.desktop" "$(BUNDLE_DIR)/media/"
 	$(Q)cat "$(ROOT_DIR)/media/openttd.desktop" | sed s/=openttd/=$(BINARY_NAME)/g > "$(ROOT_DIR)/media/openttd.desktop.install"
 endif
-ifeq ($(shell if test -n "`ls -l \"$(BIN_DIR)/scenario/\"*.scn 2> /dev/null`"; then echo 1; fi), 1)
-	$(Q)cp "$(BIN_DIR)/scenario/"*.scn        "$(BUNDLE_DIR)/scenario/"
-endif
-ifeq ($(shell if test -n "`ls -l \"$(BIN_DIR)/scenario/heightmaps/\"* 2>/dev/null`"; then echo 1; fi), 1)
-	$(Q)cp "$(BIN_DIR)/scenario/heightmaps/"* "$(BUNDLE_DIR)/scenario/heightmap/"
-endif
 ifeq ($(TTD), openttd.exe)
 	$(Q)unix2dos "$(BUNDLE_DIR)/docs/"* "$(BUNDLE_DIR)/readme.txt" "$(BUNDLE_DIR)/COPYING" "$(BUNDLE_DIR)/changelog.txt" "$(BUNDLE_DIR)/known-bugs.txt"
 ifeq ($(OS), DOS)
@@ -188,5 +180,4 @@ ifdef MENU_DIR
 	$(Q)install -d "$(INSTALL_MENU_DIR)"
 	$(Q)install -m 644 "$(ROOT_DIR)/media/openttd.desktop.install" "$(INSTALL_MENU_DIR)/${BINARY_NAME}.desktop"
 endif
-	$(Q)cp -R "$(BUNDLE_DIR)/scenario" "$(INSTALL_DATA_DIR)"
 endif # OSXAPP
diff --git a/bin/scenario/README b/bin/scenario/README
deleted file mode 100644
--- a/bin/scenario/README
+++ /dev/null
@@ -1,4 +0,0 @@
-You can place you scenarios in this dir.
-
-This file is really here to make the Makefile happy, it should be modified to
-properly handle scenarios (or maybe even not at all...).