X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=distrib%2Fprep-bin-dist-mingw;h=2dc7c6eef6187d8837ccf15528eb3091bf92456f;hb=fd96f0f738a243a4e5964aa36753ec6c28f2444a;hp=f2532a0087958375cb7684cb17a85f62ed6eea86;hpb=0515203109e5f21363e6e1571efce808e6c61cbd;p=ghc-hetmet.git

diff --git a/distrib/prep-bin-dist-mingw b/distrib/prep-bin-dist-mingw
index f2532a0..2dc7c6e 100644
--- a/distrib/prep-bin-dist-mingw
+++ b/distrib/prep-bin-dist-mingw
@@ -98,6 +98,8 @@ rmdir bin/i386-unknown-mingw32
 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
@@ -128,10 +130,11 @@ cp $mingw_bin/ar.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/
-# Remove unused cruft
+# Remove worthy, but unused tools
 rm gcc-lib/f771.exe || echo "good - f771.exe not found"
 rm gcc-lib/gnat1.exe || echo "good - gnat1.exe not found"
 rm gcc-lib/jc1.exe || echo "good - jc1.exe not found"
+rm gcc-lib/libgcj* || echo "good - libgcj libs not found"
 rm gcc-lib/jvgenmain.exe || echo "good - jvgenmain.exe not found"
 
 echo "extra header files inside of include/"