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

diff --git a/distrib/prep-bin-dist-mingw b/distrib/prep-bin-dist-mingw
index 957030a..2dc7c6e 100644
--- a/distrib/prep-bin-dist-mingw
+++ b/distrib/prep-bin-dist-mingw
@@ -36,23 +36,48 @@ fi
 
 # The gcc-lib directory of the mingw tree you want to
 # include with the binary dist.
-if [ "x${gcc_version}" == "x" ]; then
-  # The default (with mingw3)
-  export gcc_lib=$mingw_top/lib/gcc-lib/mingw32/3.2.3
-else
-  export gcc_lib=$mingw_top/lib/gcc-lib/mingw32/${gcc_version}
+if [ "x${gcc_lib}" == "x" ]; then
+ if [ "x${gcc_version}" == "x" ]; then
+   # The default (with mingw3)
+   export gcc_lib=$mingw_top/lib/gcc-lib/mingw32/3.2.3
+ else
+   export gcc_lib=$mingw_top/lib/gcc-lib/mingw32/${gcc_version}
+ fi
+fi
+if [ "x${gcc_libexec}" == "x" ]; then
+ if [ "x${gcc_version}" == "x" ]; then
+   # The default (with mingw3)
+   export gcc_libexec=$mingw_top/lib/gcc-lib/mingw32/3.2.3
+ else
+   if [ -d $mingw_top/lib/gcc-lib/mingw32/${gcc_version} ]; then
+     export gcc_libexec=$mingw_top/lib/gcc-lib/mingw32/${gcc_version}
+   elif [ -d $mingw_top/libexec/gcc/mingw32/${gcc_version} ]; then
+     export gcc_libexec=$mingw_top/libexec/gcc/mingw32/${gcc_version}
+   else
+     echo "WARNING: Unable to determine location of your gcc 'libexec' directory"
+     export gcc_libexec=$mingw_top/lib/gcc-lib/mingw32/${gcc_version}
+   fi
+ fi
 fi
 
 #Directory where a (cygwin-free) perl binary resides.
-export perl_dir=$old_ghc_top
+if [ "x${perl_dir}" == "x" ]; then
+  export perl_dir=$old_ghc_top
+fi
 
 #
 # The mingw include, lib, and bin directories; all derived
 # from ${mingw_top}.
 #
-export mingw_include=$mingw_top/include
-export mingw_lib=$mingw_top/lib
-export mingw_bin=$mingw_top/bin
+if [ "x${mingw_include}" == "x" ]; then
+  export mingw_include=$mingw_top/include
+fi
+if [ "x${mingw_lib}" == "x" ]; then
+  export mingw_lib=$mingw_top/lib
+fi
+if [ "x${mingw_bin}" == "x" ]; then
+  export mingw_bin=$mingw_top/bin
+fi
 
 # Check that we're in an OK place before starting to re-org
 # the directory tree..
@@ -73,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
@@ -94,6 +121,7 @@ echo "create gcc-lib/"
 mkdir gcc-lib
 mkdir gcc-lib/include
 cp $gcc_lib/* gcc-lib/
+cp $gcc_libexec/* gcc-lib/
 cp $gcc_lib/include/* gcc-lib/include/
 cp $mingw_lib/* gcc-lib/
 cp $mingw_bin/as.exe gcc-lib/
@@ -102,7 +130,12 @@ 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 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/"
 #
@@ -114,6 +147,11 @@ cp -Rf $mingw_include/* include/mingw
 # 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"
+rm -rf include/mingw/ddk/ || echo "ddk/ not there"
+rm -rf include/mingw/gnu/ || echo "gnu/ not there"
+rm -rf include/mingw/javax/ || echo "javax/ not there"
+rm -rf include/mingw/java/ || echo "java/ not there"
+rm -rf include/mingw/gcj/ || echo "gcj/ not there"
 
 echo "add gcc"
 cp ${mingw_bin}/gcc.exe .
@@ -129,9 +167,12 @@ cp ${perl_dir}/perl56.dll .
 echo "formatting documentation"
 cp README README.txt
 mv share doc
-cp ../ghc/docs/users_guide/users_guide.pdf doc/ || 
-  (make -C ../ghc/docs/users_guide/ pdf ; cp ../ghc/docs/users_guide/users_guide.pdf doc/) || 
-  echo "No User Guide PDF doc found"
-cp ../hslibs/doc/hslibs.pdf doc/ || 
-  (make -C ../hslibs/doc/ pdf ; cp ../hslibs/doc/hslibs.pdf doc/) ||
-  echo "No HSLIBS PDF doc found"
+
+# Leave out pdf users_guide documentation for now; problematic to build with the versions
+# of 'xsltproc' and 'fop' I've been able to lay my hands on.
+#cp ../ghc/docs/users_guide/users_guide.pdf doc/ || 
+#  (make -C ../ghc/docs/users_guide/ pdf ; cp ../ghc/docs/users_guide/users_guide.pdf doc/) || 
+#  echo "No User Guide PDF doc found"
+#cp ../hslibs/doc/hslibs.pdf doc/ || 
+#  (make -C ../hslibs/doc/ pdf ; cp ../hslibs/doc/hslibs.pdf doc/) ||
+#  echo "No HSLIBS PDF doc found"