Changeset 6334

Timestamp:

2004-01-05T12:01:59+13:00 (20 years ago)

Author:

jrm21

Message:

only try to configure a package if we successfully cd'd into its directory.
Otherwise we run the configure script in the current directory again!

File:

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

trunk/gsdl/packages/configure

@@ -108 +108 @@
     cd "$PACKAGES/mico"
     gzip -dc mico-2.3.5.tar.gz | tar -xf -
-    cd mico
+    cd mico && \
     ./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
     sed 's/tools//'  $PACKAGES/mico/mico/Makefile | sed 's/ldconfig//' >$PACKAGES/mico/mico/Makefile.out
@@ -135 +135 @@
 cd "$PACKAGES/wv"
 gzip -dc wv-0.7.1-gs.tar.gz | tar -xf -
-cd wv-gs
 # datadir is for default location of wvHtml.xml config file
+cd wv-gs && \
 ./configure $CACHE_FILE --prefix=$PACKAGES/wv --bindir="$bindir" --datadir="$prefix/etc/packages" $HOSTTARGETFLAGS
 
@@ -146 +146 @@
 cd "$PACKAGES/pdftohtml"
 gzip -dc pdftohtml_0_34.tar.gz | tar -xf -
-cd pdftohtml_0_34
+cd pdftohtml_0_34 && \
 ./configure $CACHE_FILE --prefix="$prefix" --bindir="$bindir" $HOSTTARGETFLAGS
 
@@ -156 +156 @@
 cd "$PACKAGES/rtftohtml"
 gzip -dc rtftohtml-gs.tar.gz | tar -xf -
-cd rtftohtml_src
+cd rtftohtml_src && \
 ./configure $CACHE_FILE --prefix="$prefix" --bindir="$bindir" $HOSTTARGETFLAGS
 
@@ -166 +166 @@
 then
   echo ""
-  cd "$PACKAGES/yaz"
+  cd "$PACKAGES/yaz" && \
   ./configure $CACHE_FILE $HOSTTARGETFLAGS
 else
@@ -180 +180 @@
 cd "$PACKAGES/wget"
 gzip -dc wget.tar.gz | tar -xf -
-cd "$PACKAGES/wget/wget-1.5.3"
+cd "$PACKAGES/wget/wget-1.5.3" && \
 ./configure $CACHE_FILE --prefix=$PACKAGES/wget --bindir="$bindir" $HOSTTARGETFLAGS
 
@@ -189 +189 @@
 cd "$PACKAGES/cpan"
 gzip -dc XML-Parser-2.27.tar.gz | tar -xf -
-cd "$PACKAGES/cpan/XML-Parser-2.27"
+cd "$PACKAGES/cpan/XML-Parser-2.27" && \
 perl Makefile.PL "$GSDLHOME"
 
@@ -199 +199 @@
 cd "$PACKAGES/xlhtml"
 gzip -dc xlhtml-0.4.9.0-gs.tar.gz | tar -xf -
-cd xlhtml-0.4.9.0
+cd xlhtml-0.4.9.0 && \
 ./configure $CACHE_FILE --prefix="$prefix" --bindir="$bindir" $HOSTTARGETFLAGS
 
@@ -205 +205 @@
 # configure IsisGdl program
 echo ""
-echo "Configure IsisGdl (CDS/ISIS database reader)"
-echo ""
-cd "$PACKAGES/isis-gdl"
-./configure $CACHE_FILE --prefix="$prefix" --bindir="$bindir" $HOSTTARGETFLAGS
+echo "Configuring IsisGdl (CDS/ISIS database reader)"
+echo ""
+cd "$PACKAGES/isis-gdl" && \
+./configure $CACHE_FILE --prefix="$prefix" --bindir="$bindir" $HOSTTARGETFLAGS