From 9cc6b7fffd31f4b9ee9aceef9224c84dcf28aeb8 Mon Sep 17 00:00:00 2001
From: xue <>
Date: Tue, 4 Jul 2006 23:25:41 +0000
Subject: Merge from 3.0 branch till 1239.

---
 buildscripts/phing/bin/phing.php | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'buildscripts/phing/bin/phing.php')

diff --git a/buildscripts/phing/bin/phing.php b/buildscripts/phing/bin/phing.php
index 880adf41..7d0a774a 100644
--- a/buildscripts/phing/bin/phing.php
+++ b/buildscripts/phing/bin/phing.php
@@ -13,6 +13,7 @@
 ini_set('track_errors', 1);
 
 /* set classpath */
+/*
 if (getenv('PHP_CLASSPATH')) {
 //    define('PHP_CLASSPATH',  getenv('PHP_CLASSPATH') . PATH_SEPARATOR . get_include_path());
     define('PHP_CLASSPATH',  realpath(dirname(__FILE__).'/../classes') . PATH_SEPARATOR . get_include_path());
@@ -20,6 +21,9 @@ if (getenv('PHP_CLASSPATH')) {
 } else {
     define('PHP_CLASSPATH',  get_include_path());
 }
+*/
+define('PHP_CLASSPATH',  realpath(dirname(__FILE__).'/../classes') . PATH_SEPARATOR . get_include_path());
+ini_set('include_path', PHP_CLASSPATH);
 
 require_once 'phing/Phing.php';
 
-- 
cgit v1.2.3