Changeset 2952

Show
Ignore:
Timestamp:
05.02.2002 16:30:59 (18 years ago)
Author:
jrm21
Message:

added " characters around some variables in case they have spaces in them.

Only try to source the top cache file if it exists.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • trunk/gsdl/packages/configure

    r2943 r2952  
    55GSDLHOME=`pwd` 
    66cd $PACKAGES 
    7 GSDLOS=`uname -s | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` 
     7GSDLOS=`uname -s |tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` 
    88prefix="" 
    99bindir="" 
     
    4848        # where to install binaries to 
    4949        bindir=`echo $1 | sed s/--bindir=//` 
    50         if test -d $bindir ; then 
    51           bindir=`cd $bindir ; pwd ` 
     50        # turn relative path into an absolute path 
     51        if test -d "$bindir" ; then 
     52          bindir=`cd "$bindir" ; pwd ` 
    5253          cd "$PACKAGES" 
    5354        elif test -z `echo $bindir | sed '/^\// p;D'` ; then 
    54           # turn relative path into an absolute path 
    55           rel_bindir=`echo $bindir | sed s@/.*@@` 
    56           cd $rel_bindir 
    57           bindir=`pwd`/`echo $bindir | sed s@^[^/]*/@@` 
     55          rel_bindir="`echo $bindir | sed s@/.*@@`" 
     56          cd "$rel_bindir" 
     57          bindir="`pwd`/`echo $bindir | sed s@^[^/]*/@@`" 
    5858          cd "$PACKAGES" 
    5959        else 
     
    8484##fi 
    8585 
    86 . $cache_file 
     86# This loads the top configure's cache file, with variables already set. 
     87if test -f "$cache_file" ; then 
     88  . $cache_file 
     89fi 
    8790 
    8891# we assume that gzip and tar are on the search path. 
    8992# non-GNU versions of tar don't take the -z option. 
    90  
    91  
    92 echo USE_CORBA = $USE_CORBA 
    93 echo MICO_DIR = $MICO_DIR 
    9493 
    9594if test $USE_CORBA = true ; then 
     
    141140gzip -dc pdftohtml_gs.tar.gz | tar -xf - 
    142141cd pdftohtml_0_22 
    143 # following line is temporary... 
    144 rm -f xpdf/config.h 
    145142./configure $CACHE_FILE --prefix="$prefix" --bindir="$bindir" $HOSTTARGETFLAGS 
    146143