X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=distrib%2Fprep-bin-dist-mingw;h=f98bb888479c1720ba9c35fae86e6d7253896a9d;hb=442f06cc8f9f729d33a8de3aa14cdaf80545808e;hp=6ee4d7e75492f4e741a4892fc6adc4f8d0195202;hpb=f6b7966af9e0db74a27569849fc3e5f25dc3dbe8;p=ghc-hetmet.git

diff --git a/distrib/prep-bin-dist-mingw b/distrib/prep-bin-dist-mingw
index 6ee4d7e..f98bb88 100644
--- a/distrib/prep-bin-dist-mingw
+++ b/distrib/prep-bin-dist-mingw
@@ -115,6 +115,13 @@ if ! [ -d bin ] ; then
   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
@@ -144,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/
@@ -184,9 +192,6 @@ cp ${perl_dir}/perl56.dll .
 echo "formatting documentation"
 unix2dos < README > README.txt
 rm README
-mv share/ghc/doc .
-rmdir share/ghc
-rmdir share
 
 # 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.