File tree 2 files changed +12
-12
lines changed
2 files changed +12
-12
lines changed Original file line number Diff line number Diff line change @@ -94,16 +94,16 @@ PEAR INSTALLER:
94
94
<file role =" php" name =" Guess.php" />
95
95
</dir >
96
96
<dir name =" scripts" >
97
- <file baseinstalldir =" /" role =" script" install-as =" pear" name =" pear_unices " >
97
+ <file baseinstalldir =" /" role =" script" install-as =" pear" name =" pear.sh " >
98
98
<replace from =" @php_bin@" to =" php_bin" type =" pear-config" />
99
99
<replace from =" @php_dir@" to =" php_dir" type =" pear-config" />
100
100
<replace from =" @pear_version@" to =" version" type =" package-info" />
101
101
<replace from =" @include_path@" to =" php_dir" type =" pear-config" />
102
102
</file >
103
- <file baseinstalldir =" /" role =" script" platform =" windows" install-as = " pear.bat " name =" pear.bat" >
104
- <replace from =" @bin_dir@" to =" bin_dir" type =" pear-config" />
105
- <replace from =" @php_bin@" to =" php_bin" type =" pear-config" />
106
- <replace from =" @include_path@" to =" php_dir" type =" pear-config" />
103
+ <file baseinstalldir =" /" role =" script" platform =" windows" name =" pear.bat" >
104
+ <replace from =" @bin_dir@" to =" bin_dir" type =" pear-config" />
105
+ <replace from =" @php_bin@" to =" php_bin" type =" pear-config" />
106
+ <replace from =" @include_path@" to =" php_dir" type =" pear-config" />
107
107
</file >
108
108
<file baseinstalldir =" /" role =" php" name =" pearcmd.php" >
109
109
<replace from =" @php_bin@" to =" php_bin" type =" pear-config" />
Original file line number Diff line number Diff line change 13
13
14
14
# then look for the right pear include dir
15
15
if test " x$PHP_PEAR_INSTALL_DIR " ! = " x" ; then
16
- INC=" -d include_path=$PHP_PEAR_INSTALL_DIR "
16
+ INCDIR=$PHP_PEAR_INSTALL_DIR
17
+ INCARG=" -d include_path=$PHP_PEAR_INSTALL_DIR "
17
18
else
18
19
if test " @php_dir@" = ' @' php_dir' @' ; then
19
- INC=" "
20
+ INCDIR=` dirname $0 ` /..
21
+ INCARG=" "
20
22
else
21
- INC=" -d include_path=@php_dir@"
23
+ INCDIR=" @php_dir@"
24
+ INCARG=" -d include_path=@php_dir@"
22
25
fi
23
26
fi
24
27
25
- exec $PHP -C -q $INC -d output_buffering=1 $0 $@
26
- < ? php
27
- include " @include_path@/pearcmd.php" ;
28
- ? >
28
+ exec $PHP -C -q $INCARG -d output_buffering=1 $INCDIR /pearcmd.php $@
You can’t perform that action at this time.
0 commit comments