]>
Commit | Line | Data |
---|---|---|
6efcadf2 | 1 | --- davical-0.9.9.2/inc/always.php.in.orig 2010-09-22 15:19:34.000000000 +0200 |
2 | +++ davical-0.9.9.2/inc/always.php.in 2010-09-22 15:19:48.000000000 +0200 | |
78f00bed | 3 | @@ -70,22 +70,8 @@ |
6efcadf2 | 4 | |
361324bc | 5 | // Utilities |
6 | if ( ! @include_once('AWLUtilities.php') ) { | |
6efcadf2 | 7 | - $try_paths = array( |
361324bc | 8 | - '../../awl/inc' |
78f00bed | 9 | - , '/usr/share/awl/inc' // Where it ends up on Debian |
10 | - , '/usr/share/php/awl/inc' // Fedora's standard for PHP libraries | |
361324bc | 11 | - , '/usr/local/share/awl/inc' |
6efcadf2 | 12 | - ); |
13 | - foreach( $try_paths AS $awl_include_path ) { | |
14 | - if ( @file_exists($awl_include_path.'/AWLUtilities.php') ) { | |
15 | - set_include_path( $awl_include_path. PATH_SEPARATOR. get_include_path()); | |
16 | - break; | |
17 | - } | |
18 | - } | |
19 | - if ( ! @include_once('AWLUtilities.php') ) { | |
20 | - echo "Could not find the AWL libraries. Are they installed? Check your include_path in php.ini!\n"; | |
21 | - exit; | |
22 | - } | |
23 | + echo "Could not find the AWL libraries. Are they installed? Check your include_path in php.ini!\n"; | |
24 | + exit; | |
25 | } | |
26 | ||
27 | // Ensure that ../inc is in our included paths as early as possible | |
375e919d | 28 | --- davical-0.9.9.2/dba/create-database.sh~ 2010-09-21 03:40:44.000000000 +0200 |
29 | +++ davical-0.9.9.2/dba/create-database.sh 2010-09-22 17:02:18.000000000 +0200 | |
30 | @@ -16,16 +16,10 @@ | |
31 | ||
32 | # | |
33 | # Attempt to locate the AWL directory | |
34 | -AWLDIR="${DBADIR}/../../awl" | |
35 | +AWLDIR="/usr/share/php/awl" | |
36 | if ! testawldir "${AWLDIR}"; then | |
37 | - AWLDIR="/usr/share/awl" | |
38 | - if ! testawldir "${AWLDIR}"; then | |
39 | - AWLDIR="/usr/local/share/awl" | |
40 | - if ! testawldir "${AWLDIR}"; then | |
41 | - echo "Unable to find AWL libraries" | |
42 | - exit 1 | |
43 | - fi | |
44 | - fi | |
45 | + echo "Unable to find AWL libraries" | |
46 | + exit 1 | |
47 | fi | |
48 | ||
49 | export AWL_DBAUSER=davical_dba |