X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=distrib%2Fprep-bin-dist-mingw;h=45c9743dc1856f79619a0d09318cccfc191a68da;hb=6dfdf14602aa8bc86ad99fc46002f9cd23d21e77;hp=17110c17bbce61b2ab8a3fdc4349d60b8f58bd7a;hpb=0e8481fc8cf2c332e55284ac12e7de6171fe4c2b;p=ghc-hetmet.git

diff --git a/distrib/prep-bin-dist-mingw b/distrib/prep-bin-dist-mingw
index 17110c1..45c9743 100644
--- a/distrib/prep-bin-dist-mingw
+++ b/distrib/prep-bin-dist-mingw
@@ -6,7 +6,6 @@
 #
 # To use:
 #
-#   - make sure you set BIN_DIST=1 in your mk/build.mk before you built GHC.
 #   $ cd <top of GHC build tree>
 #   $ make binary-dist
 #
@@ -110,7 +109,7 @@ fi
 
 # Check that we're in an OK place before starting to re-org
 # the directory tree..
-if ! [ -d bin/i386-unknown-mingw32 ] ; then
+if ! [ -d bin ] ; then
   echo "Doesn't look as if I'm in the toplevel directory of a mingw tree"
   echo "Usage: cd ghc-<version> ; ../distrib/prep-bin-dist-mingw"
   exit 1;
@@ -121,20 +120,9 @@ rm -f config.guess config.sub configure configure.ac mkdirhier
 rm -f Makefile-bin.in Makefile.in aclocal.m4 install-sh
 rm -rf autom4te.cache
 
-echo "rejig bin/"
-mv bin/i386-unknown-mingw32/* bin/
-rmdir bin/i386-unknown-mingw32
+echo "strip ghc"
 strip bin/ghc.exe
 
-echo "rejig lib/"
-mv lib/i386-unknown-mingw32/include/* include/ 
-rmdir lib/i386-unknown-mingw32/include
-mv lib/i386-unknown-mingw32/* .
-rmdir lib/i386-unknown-mingw32
-rmdir lib
-mv ghc-asm.prl ghc-asm
-mv ghc-split.prl ghc-split
-
 echo "create gcc-lib/"
 #
 # A bunch of stuff gets lumped into gcc-lib:
@@ -194,8 +182,8 @@ cp ${perl_dir}/perl56.dll .
 # (leave them be for now.)
 
 echo "formatting documentation"
-cp README README.txt
-mv share doc
+unix2dos < README > README.txt
+rm README
 
 # Leave out pdf users_guide documentation for now; problematic to build with the versions
 # of 'xsltproc' and 'fop' I've been able to lay my hands on.