From 5be7229f5f6ea5d1e0a96d39536cb85996ced3b3 Mon Sep 17 00:00:00 2001 From: sof Date: Tue, 3 May 2005 00:41:15 +0000 Subject: [PATCH] [project @ 2005-05-03 00:41:15 by sof] re-use prep-bin-dist-mingw by exec'ing it. Merge to STABLE --- distrib/prep-bin-dist-mingw-args | 76 +------------------------------------- 1 file changed, 1 insertion(+), 75 deletions(-) diff --git a/distrib/prep-bin-dist-mingw-args b/distrib/prep-bin-dist-mingw-args index d8199d9..d9e81b0 100644 --- a/distrib/prep-bin-dist-mingw-args +++ b/distrib/prep-bin-dist-mingw-args @@ -30,78 +30,4 @@ export mingw_include=$mingw_top/include export mingw_lib=$mingw_top/lib export mingw_bin=$mingw_top/bin -# Play safe -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- ; ../distrib/prep-bin-dist-mingw" - 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 -rm -rf autom4te.cache - -echo "rejig bin/" -mv bin/i386-unknown-mingw32/* bin/ -rmdir bin/i386-unknown-mingw32 -strip bin/ghc.exe - -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 - -echo "create gcc-lib/" -# -# A bunch of stuff gets lumped into gcc-lib: -# -# - the gcc-lib/ + gcc-lib/include of the gcc you -# intend to ship (normally located as -# lib/gcc-lib/mingw// in your mingw tree.) -# - the contents of mingw/lib/ -# - ld.exe, as.exe, dlltool.exe, dllwrap.exe from mingw/bin -# -mkdir gcc-lib -cp $gcc_lib/* 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/ -# 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/ - - -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/c++ || echo "c++/ not there" - -echo "add gcc" -cp ${mingw_bin}/gcc.exe . - -echo "copy in perl too" -cp ${perl_dir}/perl.exe . -cp ${perl_dir}/perl56.dll . - -# For reasons unknown, duplicate copies of misc package files in share/ -# (leave them be for now.) - -echo "formatting documentation" -cp README README.txt -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 - +exec $0/../prep-bin-dist-mingw -- 1.7.10.4