[project @ 2004-02-12 02:04:59 by mthomas]

General cleanup and updates.

4 files changed, 17 insertions, 12 deletions

diff --git a/distrib/prep-bin-dist-mingw-args b/distrib/prep-bin-dist-mingw-args
index 85a70f62b3..d8199d9fb5 100644
--- a/distrib/prep-bin-dist-mingw-args
+++ b/distrib/prep-bin-dist-mingw-args
@@ -31,7 +31,7 @@ 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;
@@ -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
+
diff --git a/distrib/prep-bin-dist-mingw-greencard b/distrib/prep-bin-dist-mingw-greencard
index ef57a000ec..b9b6380f0f 100644
--- a/distrib/prep-bin-dist-mingw-greencard
+++ b/distrib/prep-bin-dist-mingw-greencard
@@ -24,11 +24,10 @@ if ! [ -d bin/i386-unknown-mingw32 ] ; then
 fi;

 

 echo "rejig bin/"

-cp bin/i386-unknown-mingw32/greencard.exe $binary_dir/bin

+cp lib/i386-unknown-mingw32/greencard-bin.exe $binary_dir/bin/greencard.exe

 strip $binary_dir/bin/greencard.exe

 

 echo "rejig lib/"

-cp lib/i386-unknown-mingw32/* $binary_dir

+cp -r lib/i386-unknown-mingw32/* $binary_dir

 

-echo "rejig share/"

-cp share/* $binary_dir

+exit 0

diff --git a/distrib/prep-bin-dist-mingw-happy b/distrib/prep-bin-dist-mingw-happy
index 9efd2774be..8b9d364e81 100644
--- a/distrib/prep-bin-dist-mingw-happy
+++ b/distrib/prep-bin-dist-mingw-happy
@@ -29,3 +29,4 @@ strip $ghc_binary_dir/bin/happy.exe
 echo "rejig lib/"
 mv lib/i386-unknown-mingw32/* $ghc_binary_dir
 
+exit 0
diff --git a/distrib/prep-bin-dist-mingw-hdirect b/distrib/prep-bin-dist-mingw-hdirect
index 8fe26edbfd..a8aa21c215 100644
--- a/distrib/prep-bin-dist-mingw-hdirect
+++ b/distrib/prep-bin-dist-mingw-hdirect
@@ -28,6 +28,9 @@ cp bin/i386-unknown-mingw32/ihc.exe $binary_dir/bin
 strip $binary_dir/bin/ihc.exe

 

 echo "rejig lib/"

-cp -r lib/i386-unknown-mingw32/imports/* $binary_dir/imports

+cp -r lib/i386-unknown-mingw32/hslibs-imports/hdirect $binary_dir/imports

 cp lib/i386-unknown-mingw32/*.o $binary_dir

 cp lib/i386-unknown-mingw32/*.a $binary_dir

+mv $binary_dir/imports/hdirect $binary_dir/imports/Hdirect

+

+exit 0