(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.

10 files changed, 9 insertions, 9 deletions

diff --git a/Makefile.bundle.in b/Makefile.bundle.in
index f3096eb46..63edb62d9 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
index 17e322002..17e322002 100644
--- a/os/dos/cwsdpmi.exe
+++ b/os/dos/cwsdpmi/cwsdpmi.exe
diff --git a/os/dos/cwsdpmi.txt b/os/dos/cwsdpmi/cwsdpmi.txt
index 14b09c4d7..14b09c4d7 100644
--- a/os/dos/cwsdpmi.txt
+++ b/os/dos/cwsdpmi/cwsdpmi.txt
diff --git a/os/dos/cwsdstub.exe b/os/dos/cwsdpmi/cwsdstub.exe
index fabaf3bf4..fabaf3bf4 100644
--- a/os/dos/cwsdstub.exe
+++ b/os/dos/cwsdpmi/cwsdstub.exe
diff --git a/os/dos/copying b/os/dos/exe2coff/copying
index a43ea2126..a43ea2126 100644
--- a/os/dos/copying
+++ b/os/dos/exe2coff/copying
diff --git a/os/dos/copying.dj b/os/dos/exe2coff/copying.dj
index 8a5504784..8a5504784 100644
--- a/os/dos/copying.dj
+++ b/os/dos/exe2coff/copying.dj
diff --git a/os/dos/copying.lib b/os/dos/exe2coff/copying.lib
index bbe3fe198..bbe3fe198 100644
--- a/os/dos/copying.lib
+++ b/os/dos/exe2coff/copying.lib
diff --git a/os/dos/exe2coff.c b/os/dos/exe2coff/exe2coff.c
index aa072e8e4..aa072e8e4 100644
--- a/os/dos/exe2coff.c
+++ b/os/dos/exe2coff/exe2coff.c
diff --git a/os/dos/make_dos_binary_selfcontained.sh b/os/dos/make_dos_binary_selfcontained.sh
index c21e29d2c..259e50237 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 68cc47200..36c2af6e4 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
 ---- ---------------------------