Changeset 2952

Timestamp:

2002-02-05T16:30:59+13:00 (22 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.

File:

• trunk/gsdl/packages/configure (modified) (4 diffs)

trunk/gsdl/packages/configure

@@ -5 +5 @@
 GSDLHOME=`pwd`
 cd $PACKAGES
-GSDLOS=`uname -s | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+GSDLOS=`uname -s |tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
 prefix=""
 bindir=""
@@ -48 +48 @@
         # where to install binaries to
         bindir=`echo $1 | sed s/--bindir=//`
-        if test -d $bindir ; then
-          bindir=`cd $bindir ; pwd `
+        # turn relative path into an absolute path
+        if test -d "$bindir" ; then
+          bindir=`cd "$bindir" ; pwd `
           cd "$PACKAGES"
         elif test -z `echo $bindir | sed '/^\// p;D'` ; then
-          # turn relative path into an absolute path
-          rel_bindir=`echo $bindir | sed s@/.*@@`
-          cd $rel_bindir
-          bindir=`pwd`/`echo $bindir | sed s@^[^/]*/@@`
+          rel_bindir="`echo $bindir | sed s@/.*@@`"
+          cd "$rel_bindir"
+          bindir="`pwd`/`echo $bindir | sed s@^[^/]*/@@`"
           cd "$PACKAGES"
         else
@@ -84 +84 @@
 ##fi
 
-. $cache_file
+# This loads the top configure's cache file, with variables already set.
+if test -f "$cache_file" ; then
+  . $cache_file
+fi
 
 # we assume that gzip and tar are on the search path.
 # non-GNU versions of tar don't take the -z option.
-
-
-echo USE_CORBA = $USE_CORBA
-echo MICO_DIR = $MICO_DIR
 
 if test $USE_CORBA = true ; then
@@ -141 +140 @@
 gzip -dc pdftohtml_gs.tar.gz | tar -xf -
 cd pdftohtml_0_22
-# following line is temporary...
-rm -f xpdf/config.h
 ./configure $CACHE_FILE --prefix="$prefix" --bindir="$bindir" $HOSTTARGETFLAGS