From d155ab91ab3d82e17d06a85cd8363fd81ffd2ed5 Mon Sep 17 00:00:00 2001
From: maroy <maroy@cfc7b370-4200-0410-a6e3-cb6bdb053afe>
Date: Sun, 1 May 2005 11:13:46 +0000
Subject: [PATCH] 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)

---
 livesupport/tools/pear/bin/install.sh | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/livesupport/tools/pear/bin/install.sh b/livesupport/tools/pear/bin/install.sh
index 4851d0e71..dc77fd0f7 100755
--- a/livesupport/tools/pear/bin/install.sh
+++ b/livesupport/tools/pear/bin/install.sh
@@ -21,8 +21,8 @@
 #   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 #
-#   Author   : $Author: tomas $
-#   Version  : $Revision: 1.1 $
+#   Author   : $Author: maroy $
+#   Version  : $Revision: 1.2 $
 #   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;`
 tmpdir=$basedir/tmp
 etcdir=$basedir/etc
+usrdir=$rootdir/usr
 
 echo "installing $description (with rootdir: $rootdir)"
 
@@ -65,5 +66,13 @@ do echo $i
         { echo "*** ERROR installing $i"; exit 1; }
 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"
 exit 0