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;
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/"
#
#
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/
# 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 .
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
+
fi;\r
\r
echo "rejig bin/"\r
-cp bin/i386-unknown-mingw32/greencard.exe $binary_dir/bin\r
+cp lib/i386-unknown-mingw32/greencard-bin.exe $binary_dir/bin/greencard.exe\r
strip $binary_dir/bin/greencard.exe\r
\r
echo "rejig lib/"\r
-cp lib/i386-unknown-mingw32/* $binary_dir\r
+cp -r lib/i386-unknown-mingw32/* $binary_dir\r
\r
-echo "rejig share/"\r
-cp share/* $binary_dir\r
+exit 0\r
strip $binary_dir/bin/ihc.exe\r
\r
echo "rejig lib/"\r
-cp -r lib/i386-unknown-mingw32/imports/* $binary_dir/imports\r
+cp -r lib/i386-unknown-mingw32/hslibs-imports/hdirect $binary_dir/imports\r
cp lib/i386-unknown-mingw32/*.o $binary_dir\r
cp lib/i386-unknown-mingw32/*.a $binary_dir\r
+mv $binary_dir/imports/hdirect $binary_dir/imports/Hdirect\r
+\r
+exit 0\r