ooo-build r13679 - in trunk: . bin

[tml svn gnome org]

Author: tml
Date: Tue Aug 26 16:13:52 2008
New Revision: 13679
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13679&view=rev

Log:
2008-08-26  Tor Lillqvist  <tml novell com>

	* bin/unpack: If msvcr71.dll and msvcp71.dll are in
	$WINDIR/system32, grab them from there then without bothering the
	user to do it manually.



Modified:
   trunk/ChangeLog
   trunk/bin/unpack

Modified: trunk/bin/unpack
==============================================================================
--- trunk/bin/unpack	(original)
+++ trunk/bin/unpack	Tue Aug 26 16:13:52 2008
@@ -100,10 +100,12 @@
 	$echo_n "Looking for $SRCDIR/$F ...  $echo_c"
 	if test -f $SRCDIR/$F; then
 	    echo "ok"
+	elif test -f "$WINDIR/system32/$F"; then
+	    echo "missing, but copied from $WINDIR/system32"
+	    cp "$WINDIR/system32/$F" $SRCDIR
 	else
 	    echo "missing"
-	    echo "You might already have it in $WINDIR/system32. Copy it to $SRCDIR."
-	    echo "If not, you can find it in MSVS .NET 2003."
+	    echo "You can find it in MSVS .NET 2003."
 	    echo "It is needed by the prebuilt Mozilla binaries that you have to use"
 	    echo "because Mozilla 1.7.5 can't be built with MSVS 2005."
 	    exit 1