From 92e106653b8a0854cce6b931c817a087cd3e3612 Mon Sep 17 00:00:00 2001
From: Andrew McMillan <andrew@morphoss.com>
Date: Wed, 24 Mar 2010 12:55:08 +1300
Subject: [PATCH] Fix include path for new always.php location.

---
 inc/test-RRULE.php             | 2 +-
 scripts/sync-remote-caldav.php | 8 ++++----
 testing/test-RRULE-v2.php      | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/inc/test-RRULE.php b/inc/test-RRULE.php
index d5ac0ba3..a3ba1065 100644
--- a/inc/test-RRULE.php
+++ b/inc/test-RRULE.php
@@ -1,5 +1,5 @@
 <?php
-require_once("../inc/always.php");
+require_once("../htdocs/always.php");
 require_once("RRule.php");
 
 header("Content-type: text/plain");
diff --git a/scripts/sync-remote-caldav.php b/scripts/sync-remote-caldav.php
index 6ca8d37c..9169b76a 100755
--- a/scripts/sync-remote-caldav.php
+++ b/scripts/sync-remote-caldav.php
@@ -2,13 +2,13 @@
 <?php
 
 if ( @file_exists('../../awl/inc/AWLUtilities.php') ) {
-  set_include_path('../inc:../../awl/inc');
+  set_include_path('../inc:../htdocs:../../awl/inc');
 }
 else if ( @file_exists('../awl/inc/AWLUtilities.php') ) {
-  set_include_path('inc:../awl/inc:.');
+  set_include_path('inc:htdocs:../awl/inc:.');
 }
 else {
-  set_include_path('../inc:/usr/share/awl/inc');
+  set_include_path('../inc:../htdocs:/usr/share/awl/inc');
 }
 include('always.php');
 require_once('AwlQuery.php');
@@ -373,4 +373,4 @@ $cache_file = fopen($sync_cache_filename, 'w');
 fwrite( $cache_file, serialize($newcache) );
 fclose($cache_file);
 
-print_r($newcache);
\ No newline at end of file
+print_r($newcache);
diff --git a/testing/test-RRULE-v2.php b/testing/test-RRULE-v2.php
index 459e04a8..6d8c34f2 100755
--- a/testing/test-RRULE-v2.php
+++ b/testing/test-RRULE-v2.php
@@ -2,10 +2,10 @@
 <?php
 
 if ( @file_exists('../../awl/inc/AWLUtilities.php') ) {
-  set_include_path('../inc:../../awl/inc');
+  set_include_path('../inc:../htdocs:../../awl/inc');
 }
 else {
-  set_include_path('../inc:/usr/share/awl/inc');
+  set_include_path('../inc:../htdocs:/usr/share/awl/inc');
 }
 require_once("always.php");
 $c->dbg = array();