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

diff --git a/distrib/prep-bin-dist-mingw b/distrib/prep-bin-dist-mingw
index 957030a..042805a 100644
--- a/distrib/prep-bin-dist-mingw
+++ b/distrib/prep-bin-dist-mingw
@@ -44,15 +44,23 @@ else
 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..
@@ -114,6 +122,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 +142,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"