X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=distrib%2Fprep-bin-dist-mingw;h=f98bb888479c1720ba9c35fae86e6d7253896a9d;hb=d05212cf8475778cf41758c04f4eee510ae47e98;hp=be4ec243ab524090093db6cc021b695b99ac1282;hpb=8e02b4abfbaa10521efaf926517b96413148d2e1;p=ghc-hetmet.git

diff --git a/distrib/prep-bin-dist-mingw b/distrib/prep-bin-dist-mingw
index be4ec24..f98bb88 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,31 +109,27 @@ 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;
 fi;
 
+if [ "`$mingw_bin/windres.exe --version | sed '1p;d'`" = "GNU windres 2.17.50 20060824" ]
+then
+  echo "Bad windres version for $mingw_bin/windres.exe."
+  echo "2.15.91 and 2.18.50 are known to work."
+  exit 1
+fi
+
 echo "Removing configure script files...not needed"
 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:
@@ -156,6 +151,7 @@ cp $mingw_lib/* gcc-lib/
 cp $mingw_bin/as.exe gcc-lib/
 cp $mingw_bin/ld.exe gcc-lib/
 cp $mingw_bin/ar.exe bin/
+cp $mingw_bin/windres.exe bin/
 # Note: later versions of dlltool.exe depend on a bfd helper DLL.
 cp $mingw_bin/dllwrap.exe gcc-lib/
 cp $mingw_bin/dlltool.exe gcc-lib/
@@ -175,7 +171,7 @@ cp -Rf $mingw_include/* include/mingw
 # g++-3/ subdir causes problems with installer tool (+ being a 
 # troublesome character); leave out for now.
 #rm -rf include/mingw/g++-3/ || echo "g++-3/ not there"
-rm -rf include/mingw/c++/ || echo "c++/ not there"
+#rm -rf include/mingw/c++/ || echo "c++/ not there"
 rm -rf include/mingw/ddk/ || echo "ddk/ not there"
 rm -rf include/mingw/gnu/ || echo "gnu/ not there"
 rm -rf include/mingw/javax/ || echo "javax/ not there"
@@ -194,8 +190,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.