diff --git a/livesupport/tools/pear/bin/install.sh b/livesupport/tools/pear/bin/install.sh index ce1ff281f..ccfd6aa22 100755 --- a/livesupport/tools/pear/bin/install.sh +++ b/livesupport/tools/pear/bin/install.sh @@ -21,7 +21,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # -# Author : $Author: tomas $ +# Author : $Author$ # Version : $Revision: 1.10 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/tools/pear/bin/install.sh,v $ #------------------------------------------------------------------------------- @@ -173,7 +173,8 @@ do echo -n " " $pearcmd upgrade $pkgv.tgz >/dev/null && echo -n "upgrading to $pkgv" #|| echo -n "code: $?" ) || ( - $pearcmd install $pkgv.tgz >/dev/null && echo -n "installing $pkgv" || exit 1 +# $pearcmd install $pkgv.tgz >/dev/null && echo -n "installing $pkgv" || exit 1 + $pearcmd install $pkgv.tgz && echo -n "installing $pkgv" || exit 1 ) check_pear_module $pkg && echo " OK" || exit 1 done diff --git a/livesupport/tools/pear/etc/Makefile.in b/livesupport/tools/pear/etc/Makefile.in index e903362b8..02a4c3efb 100644 --- a/livesupport/tools/pear/etc/Makefile.in +++ b/livesupport/tools/pear/etc/Makefile.in @@ -20,7 +20,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # -# Author : $Author: tomas $ +# Author : $Author$ # Version : $Revision: 1.4 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/tools/pear/etc/Makefile.in,v $ #------------------------------------------------------------------------------- @@ -61,8 +61,12 @@ install: copy_files ${INSTALL_DIR}/usr/lib/pear/bin/install.sh -d ${INSTALL_DIR} copy_files: - ${MKDIR} ${INSTALL_DIR}/usr/lib - cp -pPR ${BASE_DIR}/../pear ${INSTALL_DIR}/usr/lib + ${MKDIR} ${INSTALL_DIR}/usr/lib/pear/bin + ${MKDIR} ${INSTALL_DIR}/usr/lib/pear/etc + ${MKDIR} ${INSTALL_DIR}/usr/lib/pear/src + cp -pP ${BASE_DIR}/../pear/bin/install.sh ${INSTALL_DIR}/usr/lib/pear/bin + cp -pP ${BASE_DIR}/../pear/etc/pear.conf.template ${INSTALL_DIR}/usr/lib/pear/etc + cp -pP ${BASE_DIR}/../pear/src/*.tgz ${INSTALL_DIR}/usr/lib/pear/src clean: