Changeset 21173 for gs2-extensions/gsdl-video/trunk/CASCADE-MAKE.sh

Timestamp:

2009-12-01T22:32:16+13:00 (14 years ago)

Author:

davidb

Message:

No longer have top level 'installed' folder.

File:

• gs2-extensions/gsdl-video/trunk/CASCADE-MAKE.sh (modified) (2 diffs)

gs2-extensions/gsdl-video/trunk/CASCADE-MAKE.sh

@@ -9 +9 @@
 fi
 
-if [ ! -d "$GSDLHOME/apache-httpd" ] ; then
+if [ -z $APACHE_HTTPD_HOME ] ; then
+  export APACHE_HTTPD_HOME=$GSDLHOME/apache-httpd/$GSDLOS
+fi
+
+if [ ! -d "$APACHE_HTTPD_HOME" ] ; then
   # ... and it also needs to have been configured with --enable-apache-httpd
   # This is because the entension needs to add mod_flvx to the web server
 
-  echo "Could not find the directory \"$GSDLHOME/apache-httpd\""
-  echo "Has the main Greenstone been configure for this? "
-  echo "e.g. ./configure --enable-apache-httpd [... other options]"
-  exit -1
+  echo "Warning: Could not find the directory \"$APACHE_HTTPD_HOME\""
+  echo "         Has the main Greenstone been configure for this? "
+  echo "         e.g. ./configure --enable-apache-httpd [... other options]"
+  echo ""
+  echo "=> Only the build-time code for the extension will be compiled"
+  export APACHE_HTTPD_HOME=
 fi
 
@@ -25 +31 @@
 # Guaranteed that GSDLOS has now been set
 
-for d in $GSDLOS ; do
-  if [ ! -e $GEXTVIDEO_INSTALLED/$d ] ; then
-    echo "Creating $GEXTVIDEO_INSTALLED/$d"
-    mkdir $GEXTVIDEO_INSTALLED/$d
-  fi
-done
+if [ ! -e $GEXTVIDEO_INSTALLED ] ; then
+  echo "Creating $GEXTVIDEO_INSTALLED"
+  mkdir $GEXTVIDEO_INSTALLED
+fi
 
-dirlist="build-srcpack runtime-srcpack"
+dirlist="build-srcpack"
+
+if [ ! -z $APACHE_HTTPD_HOME ] ; then
+  dirlist="$dirlist runtime-srcpack"
+fi
+
 if [ -e devel-srcpack ] ; then
   dirlist="$dirlist devel-srcpack"