From e25844cdf2d243ea62dff53056819887ddfe610f Mon Sep 17 00:00:00 2001
From: matthijs <matthijs@openttd.org>
Date: Thu, 19 Sep 2013 07:42:13 +0000
Subject: [PATCH] (svn r25780) -Change: [DOS] Put cwsdpmi and exe2coff files in
 subdirectories.   - Since these are different components, distributed under a
 different     license, mixing them in the same directory is confusing.

---
 Makefile.bundle.in                      |   4 ++--
 os/dos/{ => cwsdpmi}/cwsdpmi.exe        | Bin
 os/dos/{ => cwsdpmi}/cwsdpmi.txt        |   0
 os/dos/{ => cwsdpmi}/cwsdstub.exe       | Bin
 os/dos/{ => exe2coff}/copying           |   0
 os/dos/{ => exe2coff}/copying.dj        |   0
 os/dos/{ => exe2coff}/copying.lib       |   0
 os/dos/{ => exe2coff}/exe2coff.c        |   0
 os/dos/make_dos_binary_selfcontained.sh |   8 ++++----
 readme.txt                              |   6 +++---
 10 files changed, 9 insertions(+), 9 deletions(-)
 rename os/dos/{ => cwsdpmi}/cwsdpmi.exe (100%)
 rename os/dos/{ => cwsdpmi}/cwsdpmi.txt (100%)
 rename os/dos/{ => cwsdpmi}/cwsdstub.exe (100%)
 rename os/dos/{ => exe2coff}/copying (100%)
 rename os/dos/{ => exe2coff}/copying.dj (100%)
 rename os/dos/{ => exe2coff}/copying.lib (100%)
 rename os/dos/{ => exe2coff}/exe2coff.c (100%)

diff --git a/Makefile.bundle.in b/Makefile.bundle.in
index f3096eb464..63edb62d97 100644
--- a/Makefile.bundle.in
+++ b/Makefile.bundle.in
@@ -90,9 +90,9 @@ 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)
-	$(Q)cp "$(ROOT_DIR)/os/dos/cwsdpmi.txt"   "$(BUNDLE_DIR)/docs/"
+	$(Q)cp "$(ROOT_DIR)/os/dos/cwsdpmi/cwsdpmi.txt"   "$(BUNDLE_DIR)/docs/"
 ifndef STRIP
-	$(Q)cp "$(ROOT_DIR)/os/dos/cwsdpmi.exe"   "$(TTD_DIR)/"
+	$(Q)cp "$(ROOT_DIR)/os/dos/cwsdpmi/cwsdpmi.exe"   "$(TTD_DIR)/"
 endif
 endif
 endif
diff --git a/os/dos/cwsdpmi.exe b/os/dos/cwsdpmi/cwsdpmi.exe
similarity index 100%
rename from os/dos/cwsdpmi.exe
rename to os/dos/cwsdpmi/cwsdpmi.exe
diff --git a/os/dos/cwsdpmi.txt b/os/dos/cwsdpmi/cwsdpmi.txt
similarity index 100%
rename from os/dos/cwsdpmi.txt
rename to os/dos/cwsdpmi/cwsdpmi.txt
diff --git a/os/dos/cwsdstub.exe b/os/dos/cwsdpmi/cwsdstub.exe
similarity index 100%
rename from os/dos/cwsdstub.exe
rename to os/dos/cwsdpmi/cwsdstub.exe
diff --git a/os/dos/copying b/os/dos/exe2coff/copying
similarity index 100%
rename from os/dos/copying
rename to os/dos/exe2coff/copying
diff --git a/os/dos/copying.dj b/os/dos/exe2coff/copying.dj
similarity index 100%
rename from os/dos/copying.dj
rename to os/dos/exe2coff/copying.dj
diff --git a/os/dos/copying.lib b/os/dos/exe2coff/copying.lib
similarity index 100%
rename from os/dos/copying.lib
rename to os/dos/exe2coff/copying.lib
diff --git a/os/dos/exe2coff.c b/os/dos/exe2coff/exe2coff.c
similarity index 100%
rename from os/dos/exe2coff.c
rename to os/dos/exe2coff/exe2coff.c
diff --git a/os/dos/make_dos_binary_selfcontained.sh b/os/dos/make_dos_binary_selfcontained.sh
index c21e29d2c3..259e502372 100755
--- a/os/dos/make_dos_binary_selfcontained.sh
+++ b/os/dos/make_dos_binary_selfcontained.sh
@@ -3,9 +3,9 @@
 # $Id$
 
 cd `dirname $0`
-cc -o exe2coff exe2coff.c || exit
+cc -o exe2coff/exe2coff exe2coff/exe2coff.c || exit
 cp $1 binary.exe || exit
-./exe2coff binary.exe || exit
-cat cwsdstub.exe binary > binary.exe || exit
+./exe2coff/exe2coff binary.exe || exit
+cat cwsdpmi/cwsdstub.exe binary > binary.exe || exit
 mv binary.exe $1
-rm binary exe2coff
+rm binary exe2coff/exe2coff
diff --git a/readme.txt b/readme.txt
index 68cc47200a..36c2af6e43 100644
--- a/readme.txt
+++ b/readme.txt
@@ -476,9 +476,9 @@ DOS:
   website. Compilation is straight forward: use make, but do a './configure'
   before the first build. The build binary will need cwsdpmi.exe to be in
   the same directory as the openttd executable. cwsdpmi.exe can be found in
-  the os/dos subdirectory. If you compile with stripping turned on a binary
-  will be generated that does not need cwsdpmi.exe by adding the cswdstub.exe
-  to the created OpenTTD binary.
+  the os/dos/cwsdpmi subdirectory. If you compile with stripping turned on a
+  binary will be generated that does not need cwsdpmi.exe by adding the
+  cswdstub.exe to the created OpenTTD binary.
 
 7.1) Required/optional libraries
 ---- ---------------------------