[Libreoffice-commits] .: bin/unpack Makefile.am

Tor Lillqvist tml at kemper.freedesktop.org
Tue Dec 21 09:43:30 PST 2010


 Makefile.am |    1 -
 bin/unpack  |    6 ------
 2 files changed, 7 deletions(-)

New commits:
commit 68678a6a8ac7a63d02e850f09f00d2afd8edd89b
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Tue Dec 21 19:35:49 2010 +0200

    Don't bother with msvcr71

diff --git a/Makefile.am b/Makefile.am
index d32a7c3..c8863bc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -119,7 +119,6 @@ $(STAMP_DIR)/prebuild : $(OOBUILDDIR)/unpack
 	mkdir -p $(BUILDDIR)/man
 	mkdir -p $(BUILDDIR)/man/man1
 	mkdir -p $(OOBUILDDIR)
-	mkdir -p $(OOBUILDDIR)/external/msvcp71
 	touch $@
 
 build.tools : $(STAMP_DIR)/build.tools
diff --git a/bin/unpack b/bin/unpack
index a994bec..d5e08b9 100755
--- a/bin/unpack
+++ b/bin/unpack
@@ -506,12 +506,6 @@ if test "z$BUILD_WIN32" != "z"; then
 	CommonProgsX86="$COMMONPROGRAMFILES"
     fi
 
-     if test -f $OOBUILDDIR/external/msvcp71/msvcr71.dll; then
- 	echo "Already have msvcr71.dll"
-     else
-       cp -p $SRCDIR/msvcr71.dll $OOBUILDDIR/external/msvcp71
-     fi
- 
     if test -f $OOBUILDDIR/external/msm90/Microsoft_VC90_CRT_x86.msm -a \
             -f $OOBUILDDIR/external/msm90/policy_9_0_Microsoft_VC90_CRT_x86.msm; then
 	echo "Already have Microsoft_VC90_CRT_x86.msm and policy_9_0_Microsoft_VC90_CRT_x86.msm"


More information about the Libreoffice-commits mailing list