X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=distrib%2Fprep-bin-dist-mingw-args;h=d8199d9fb5d7bef16988233e2547c21136ae5dac;hp=950f7deaf10daa270bce884a6adcb01d9e6993a7;hb=272a418428beede04a9c4ae027474878c59d6ca1;hpb=6e5df3a4551b8d8b83e936b3f7b52edfc778ca8a

diff --git a/distrib/prep-bin-dist-mingw-args b/distrib/prep-bin-dist-mingw-args
index 950f7de..d8199d9 100644
--- a/distrib/prep-bin-dist-mingw-args
+++ b/distrib/prep-bin-dist-mingw-args
@@ -31,14 +31,14 @@ export mingw_lib=$mingw_top/lib
 export mingw_bin=$mingw_top/bin
 
 # Play safe
-if ! [ -d bin/i386-unknown-mingw32 ] ; then
+if [ ! -d bin/i386-unknown-mingw32 ] ; 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;
 
 echo "Removing configure script files...not needed"
-rm -f config.guess config.sub configure configure.in mkdirhier
+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
 
@@ -51,8 +51,8 @@ echo "rejig lib/"
 mv lib/i386-unknown-mingw32/* .
 rmdir lib/i386-unknown-mingw32
 rmdir lib
-mv ghc-asm.prl ghc-asm
-mv ghc-split.prl ghc-split
+# mv ghc-asm.prl ghc-asm
+# mv ghc-split.prl ghc-split
 
 echo "create gcc-lib/"
 #
@@ -66,7 +66,7 @@ echo "create gcc-lib/"
 #
 mkdir gcc-lib
 cp $gcc_lib/* gcc-lib/
-cp $gcc_lib/include/* gcc-lib/
+cp $gcc_lib/include/ gcc-lib/
 cp $mingw_lib/* gcc-lib/
 cp $mingw_bin/as.exe gcc-lib/
 cp $mingw_bin/ld.exe gcc-lib/
@@ -80,15 +80,15 @@ echo "extra header files inside of include/"
 # contains mingw/include
 mkdir include/mingw
 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/g++-3/ || echo "g++-3/ not there"
 rm -rf include/mingw/c++ || echo "c++/ not there"
 
 echo "add gcc"
-# cp ${mingw_bin}/gcc.exe .
-cp ${mingw_bin}/gcc-2.exe gcc.exe
+cp ${mingw_bin}/gcc.exe .
 
 echo "copy in perl too"
 cp ${perl_dir}/perl.exe .
@@ -103,3 +103,5 @@ mv share doc
 cp ../ghc/docs/users_guide/users_guide.pdf doc/ || echo "No User Guide PDF doc found"
 cp ../hslibs/doc/hslibs.pdf doc/ || echo "No HSLIBS PDF doc found"
 
+exit 0
+