changeset 3635:3aea065ad216 octave-forge

fix for glib/pango test
author goffioul
date Wed, 11 Jul 2007 20:21:26 +0000
parents 1943afa642b1
children 90d9933cbf2c
files admin/Windows/msvc/run_compilation.sh
diffstat 1 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/admin/Windows/msvc/run_compilation.sh	Wed Jul 11 20:18:48 2007 +0000
+++ b/admin/Windows/msvc/run_compilation.sh	Wed Jul 11 20:21:26 2007 +0000
@@ -17,10 +17,10 @@
 # Configuration #
 #################
 
-INSTALL_DIR=/d/Temp/vclibs_tmp
-CYGWIN_DIR=/d/Software/cygwin
+INSTALL_DIR=/c/Temp/vclibs_tmp
+CYGWIN_DIR=/c/Software/cygwin
 DOWNLOAD_DIR=downloaded_packages
-WGET_FLAGS="-e http_proxy=http://webproxy:8123 -e ftp_proxy=http://webproxy:8123"
+#WGET_FLAGS="-e http_proxy=http://webproxy:8123 -e ftp_proxy=http://webproxy:8123"
 DOATLAS=false
 
 verbose=true
@@ -629,9 +629,9 @@
 echo -n "checking for cairo... "
 if test ! -f "$tbindir/libcairo-2.dll"; then
   echo "no"
-  download_file cairo-1.2.6.tar http://cairographics.org/releases/cairo-1.2.6.tar.gz
+  download_file cairo-1.2.6.tar.gz http://cairographics.org/releases/cairo-1.2.6.tar.gz
   echo -n "decompressing cairo... "
-  (cd "$DOWNLOAD_DIR" && tar xf cairo-1.2.6.tar)
+  (cd "$DOWNLOAD_DIR" && tar xfz cairo-1.2.6.tar.gz)
   cp libs/cairo-1.2.6.diff "$DOWNLOAD_DIR/cairo-1.2.6"
   echo "done"
   echo "compiling cairo... "
@@ -658,7 +658,7 @@
 ##############
 
 echo -n "checking for glib/pango... "
-if test ! -f "$tbindir/libglib-2.0-0.dll" -a -f "$tbindir/libpango-1.0-0.dll"; then
+if ! test -f "$tbindir/libglib-2.0-0.dll" -a -f "$tbindir/libpango-1.0-0.dll"; then
   echo "no"
   download_file glib-2.12.6.tar.gz ftp://ftp.gtk.org/pub/glib/2.12/glib-2.12.6.tar.gz
   echo -n "decompressing glib... "