From: sof <unknown>
Date: Tue, 3 May 2005 00:42:28 +0000 (+0000)
Subject: [project @ 2005-05-03 00:42:28 by sof]
X-Git-Tag: Initial_conversion_from_CVS_complete~621
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=e793f8bf9331341e3d1ab9fcd7b6000c8cfaaa16;p=ghc-hetmet.git

[project @ 2005-05-03 00:42:28 by sof]
permit mingw_* vars to be overridden; merge to STABLE
---

diff --git a/distrib/prep-bin-dist-mingw b/distrib/prep-bin-dist-mingw
index 4d462a4..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..