Changeset 2169


Ignore:
Timestamp:
2001-03-13T17:52:33+13:00 (23 years ago)
Author:
jrm21
Message:

Better check for bindir (can't cd to it if it doesn't exist yet...) Don't assume tar is GNU tar (with -z option)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/gsdl/packages/configure

    r2133 r2169  
    66cd $PACKAGES
    77GSDLOS=`uname | tr A-Z a-z`
     8# bindir can be overridden on command line.
    89bindir=$GSDLHOME/bin/$GSDLOS
    910
     
    3334        ;;
    3435    --bindir=*)
    35         bindira=`echo $1 | sed s/--bindir=//`
    36         # turn relative path into an absolute path
    37         bindir=`echo $bindira | sed 's@/[^/]*$@@'`
    38         bindir=`cd $bindir 2>/dev/null && pwd`
    39         bindirb=`echo $bindira | sed 's@.*/@@'`
    40         bindir="$bindir/$bindirb"
     36        bindir=`echo $1 | sed s/--bindir=//`
     37        if test -d $bindir ; then
     38          bindir=`cd $bindir ; pwd `
     39          cd "$PACKAGES"
     40        elif test -z `echo $bindir | sed '/^\// p;D'` ; then
     41          # turn relative path into an absolute path
     42          rel_bindir=`echo $bindir | sed s@/.*@@`
     43          cd $rel_bindir
     44          bindir=`pwd`/`echo $bindir | sed s@^[^/]*/@@`
     45          cd "$PACKAGES"
     46        else
     47          # bindir doesn't exist, and isn't relative
     48          true
     49        fi
    4150        ;;
    4251    *)
     
    4756done
    4857
    49 if test -n "$USE_CORBA"; then
    50   # configure the MICO CORBA ORB
     58# we assume that gzip and tar are on the search path.
     59# non-GNU versions of tar don't take the -z option.
     60
     61
    5162  echo ""
    5263  echo "Configuring MICO CORBA"
     64if test x$USE_CORBA = xtrue ; then
     65  # configure the MICO CORBA ORB
    5366  echo ""
    5467
    5568  cd "$PACKAGES/mico"
    56   tar -xzf mico-2.3.5.tar.gz
     69  gzip -dc mico-2.3.5.tar.gz | tar -xf -
    5770  cd mico
    5871  ./configure $CACHE_FILE    --prefix=$PACKAGES/mico/  --disable-coss --disable-naming --disable-relship --disable-events --disable-streams --disable-property --disable-trader --disable-time --disable-debug --enable-optimize --enable-final --enable-speed-tune
    5972  sed 's/tools//'  $PACKAGES/mico/mico/Makefile | sed 's/ldconfig//' >$PACKAGES/mico/mico/Makefile.out
    6073  mv $PACKAGES/mico/mico/Makefile.out $PACKAGES/mico/mico/Makefile
     74else
     75  echo "corba support disabled - mico compiler not required."
     76  echo "  add '--enable-corba' to the configure command to include corba support."
     77  echo ""
    6178fi
     79
    6280
    6381
     
    7088
    7189cd "$PACKAGES/wv"
    72 tar -xzf wv-0.6.3-gs.tar.gz
     90gzip -dc wv-0.6.3-gs.tar.gz | tar -xf -
    7391cd wv-gs
    74 ./configure $CACHE_FILE --prefix=$PACKAGES/wv --bindir=$bindir
     92./configure $CACHE_FILE --prefix=$PACKAGES/wv --bindir="$bindir"
    7593
    7694# configure the pdftohtml converter
     
    8098
    8199cd "$PACKAGES/pdftohtml"
    82 tar -xzf pdftohtml_0_22_gs.tar.gz
     100gzip -dc pdftohtml_0_22_gs.tar.gz | tar -xf -
    83101cd pdftohtml_0_22
    84102
     
    86104echo ""
    87105echo "Configuring YAZ"
    88 if test x"$USE_Z3950" = "xtrue";
     106if test x$USE_Z3950 = xtrue ;
    89107then
    90108  echo ""
     
    104122tar -xzf wget.tar.gz
    105123cd $PACKAGES/wget/wget-1.5.3
    106 ./configure $CACHE_FILE --prefix=$PACKAGES/wget --bindir=$bindir
     124./configure $CACHE_FILE --prefix=$PACKAGES/wget --bindir="$bindir"
     125
     126
     127
Note: See TracChangeset for help on using the changeset viewer.