Changeset 11363

Timestamp:

2008-09-04 11:03:00 (3 months ago)

Author:

olly

Message:

Update to handle search-xapian subdirectory.

Files:

• trunk/bootstrap (modified) (3 diffs)

trunk/bootstrap

@@ -203 +203 @@
 done
 
+# Search::Xapian doesn't use autotools.
+if [ -f "search-xapian/Makefile.PL" ] ; then
+  modules="$modules search-xapian"
+fi
+
 # Generate the top-level configure script.
 rm -f configure.tmp
@@ -306 +311 @@
       cd "$d" && "$configure" --enable-maintainer-mode --cache-file="$here/config.cache" ${1+"$@"}
       ;;
+    search-xapian)
+      # Extract any CXX=... argument from those passed to us.
+      unset cxxarg
+      for arg
+      do
+        case $arg in
+          CXX=*) cxxarg=$arg ;;
+        esac
+      done
+      cd "$d" && perl Makefile.PL XAPIAN_CONFIG="$XAPIAN_CONFIG" ${cxxarg+"$cxxarg"}
+      ;;
     *)
       cd "$d" && "$configure" --enable-maintainer-mode --cache-file="$here/config.cache" XAPIAN_CONFIG="$XAPIAN_CONFIG" ${1+"$@"}
@@ -326 +342 @@
       # Need to ensure swig is built before "make dist", "make check", etc.
       echo "    cd $d && \$(MAKE)" >> Makefile.tmp ;;
-    swig,mostlyclean)
+    swig,mostlyclean|search-xapian,mostlyclean)
       echo "    cd $d && \$(MAKE) clean" >> Makefile.tmp ;;
-    swig,*)
-      echo "    cd $d && \$(MAKE) $target" >> Makefile.tmp ;;
+    search-xapian,install-strip)
+      echo "    cd $d && \$(MAKE) install" >> Makefile.tmp ;;
+    search-xapian,maintainer-clean)
+      echo "    cd $d && \$(MAKE) realclean" >> Makefile.tmp ;;
+    search-xapian,distcheck)
+      echo "    cd $d && \$(MAKE) disttest" >> Makefile.tmp ;;
     xapian-bindings,distcheck)
       # FIXME: distcheck doesn't currently work for xapian-bindings because