made some fixes for issue #880
see http://bugs.campware.org/view.php?id=880
This commit is contained in:
parent
2e4c52de31
commit
36c2ced07d
|
@ -21,8 +21,8 @@
|
|||
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
#
|
||||
#
|
||||
# Author : $Author: tomas $
|
||||
# Version : $Revision: 1.5 $
|
||||
# Author : $Author: maroy $
|
||||
# Version : $Revision: 1.6 $
|
||||
# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/bin/Attic/copyInstall.sh,v $
|
||||
#-------------------------------------------------------------------------------
|
||||
#-------------------------------------------------------------------------------
|
||||
|
@ -151,7 +151,6 @@ cp -pPR $modules_dir/htmlUI/var $install_var/htmlUI
|
|||
#-------------------------------------------------------------------------------
|
||||
cp -pPR $usrdir/lib/* $install_lib
|
||||
cp -pPR $usrdir/etc/* $install_etc
|
||||
cp -pPR $usrdir/lib/php/* $install_lib
|
||||
|
||||
|
||||
#-------------------------------------------------------------------------------
|
||||
|
|
|
@ -21,8 +21,8 @@
|
|||
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
#
|
||||
#
|
||||
# Author : $Author: tomas $
|
||||
# Version : $Revision: 1.8 $
|
||||
# Author : $Author: maroy $
|
||||
# Version : $Revision: 1.9 $
|
||||
# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/bin/dist.sh,v $
|
||||
#-------------------------------------------------------------------------------
|
||||
#-------------------------------------------------------------------------------
|
||||
|
@ -181,6 +181,7 @@ taglib_version=taglib-1.3.1
|
|||
taglib_tmpdir=$tools_tmpdir/taglib
|
||||
|
||||
pear_dir=$toolsdir/pear
|
||||
pear_tmpdir=$tools_tmpdir/pear
|
||||
|
||||
#-------------------------------------------------------------------------------
|
||||
# Create the sources tarball first
|
||||
|
@ -287,7 +288,7 @@ mkdir -p $taglib_tmpdir
|
|||
cp -pPR $taglib_dir/$taglib_version $taglib_tmpdir
|
||||
|
||||
mkdir -p $pear_tmpdir
|
||||
cp -pPR $pear_dir $tools_tmpdir
|
||||
cp -pPR $pear_dir/* $pear_tmpdir
|
||||
|
||||
|
||||
#-------------------------------------------------------------------------------
|
||||
|
|
|
@ -21,8 +21,8 @@
|
|||
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
#
|
||||
#
|
||||
# Author : $Author: tomas $
|
||||
# Version : $Revision: 1.2 $
|
||||
# Author : $Author: maroy $
|
||||
# Version : $Revision: 1.3 $
|
||||
# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/bin/preInstall.sh,v $
|
||||
#-------------------------------------------------------------------------------
|
||||
#-------------------------------------------------------------------------------
|
||||
|
@ -164,20 +164,6 @@ check_exe "php" || exit 1;
|
|||
check_exe "pear" || exit 1;
|
||||
check_exe "odbcinst" || exit 1;
|
||||
|
||||
#check_pear_module "DB" || exit 1;
|
||||
#check_pear_module "Calendar" || exit 1;
|
||||
#check_pear_module "File" || exit 1;
|
||||
#check_pear_module "File_Find" || exit 1;
|
||||
#check_pear_module "HTML_Common" || exit 1;
|
||||
#check_pear_module "HTML_QuickForm" || exit 1;
|
||||
#check_pear_module "XML_Beautifier" || exit 1;
|
||||
#check_pear_module "XML_Parser" || exit 1;
|
||||
#check_pear_module "XML_RPC" || exit 1;
|
||||
#check_pear_module "XML_Serializer" || exit 1;
|
||||
#check_pear_module "XML_Util" || exit 1;
|
||||
|
||||
echo "preinstalling pear packages..."
|
||||
$toolsdir/pear/bin/install.sh || exit 1;
|
||||
|
||||
#-------------------------------------------------------------------------------
|
||||
# Say goodbye
|
||||
|
|
Loading…
Reference in New Issue