added a workaround so that pear packages are installed under
usr/lib/php always (sometimes the pear installer puts them into usr/share/pear instead)
This commit is contained in:
parent
21ae4aeb8e
commit
d155ab91ab
1 changed files with 11 additions and 2 deletions
|
@ -21,8 +21,8 @@
|
||||||
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
#
|
#
|
||||||
#
|
#
|
||||||
# Author : $Author: tomas $
|
# Author : $Author: maroy $
|
||||||
# Version : $Revision: 1.1 $
|
# Version : $Revision: 1.2 $
|
||||||
# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/tools/pear/bin/install.sh,v $
|
# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/tools/pear/bin/install.sh,v $
|
||||||
#-------------------------------------------------------------------------------
|
#-------------------------------------------------------------------------------
|
||||||
#-------------------------------------------------------------------------------
|
#-------------------------------------------------------------------------------
|
||||||
|
@ -55,6 +55,7 @@ basedir=`cd $reldir; pwd;`
|
||||||
rootdir=`cd $basedir/../..; pwd;`
|
rootdir=`cd $basedir/../..; pwd;`
|
||||||
tmpdir=$basedir/tmp
|
tmpdir=$basedir/tmp
|
||||||
etcdir=$basedir/etc
|
etcdir=$basedir/etc
|
||||||
|
usrdir=$rootdir/usr
|
||||||
|
|
||||||
echo "installing $description (with rootdir: $rootdir)"
|
echo "installing $description (with rootdir: $rootdir)"
|
||||||
|
|
||||||
|
@ -65,5 +66,13 @@ do echo $i
|
||||||
{ echo "*** ERROR installing $i"; exit 1; }
|
{ echo "*** ERROR installing $i"; exit 1; }
|
||||||
done
|
done
|
||||||
|
|
||||||
|
# ugly work-around, as some system install the modules under
|
||||||
|
# usr/share/pear, but we're expecting it to be at usr/lib/php
|
||||||
|
|
||||||
|
if [ -d $usrdir/share/pear ]; then
|
||||||
|
rm -rf $usrdir/lib/php
|
||||||
|
mv -f $usrdir/share/pear $usrdir/lib/php
|
||||||
|
fi
|
||||||
|
|
||||||
echo "PEAR packages install finished OK"
|
echo "PEAR packages install finished OK"
|
||||||
exit 0
|
exit 0
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue