Do not move unzipped folders of ActivePerl.

Instead of stripping the prefixing directories ActivePerl\\Perl to have
\\bin directly in $ACTIVE_PERL_DIR, set INTLTOOL_PERL to the unchanged
path.  This makes Installer.bat work again.


git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@15582 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Andreas Köhler 2007-02-15 21:09:59 +00:00
parent 6eb4fef9b9
commit 22a6238170

View File

@ -172,19 +172,12 @@ function inst_readline() {
function inst_active_perl() { function inst_active_perl() {
setup ActivePerl \(intltool\) setup ActivePerl \(intltool\)
_ACTIVE_PERL_WFSDIR=`win_fs_path $ACTIVE_PERL_DIR` _ACTIVE_PERL_WFSDIR=`win_fs_path $ACTIVE_PERL_DIR`
add_to_env $_ACTIVE_PERL_WFSDIR/bin/perl INTLTOOL_PERL add_to_env $_ACTIVE_PERL_WFSDIR/ActivePerl/Perl/bin/perl INTLTOOL_PERL
if quiet $INTLTOOL_PERL --help if quiet $INTLTOOL_PERL --help
then then
echo "ActivePerl already installed. skipping." echo "ActivePerl already installed. skipping."
else else
wget_unpacked $ACTIVE_PERL_URL $DOWNLOAD_DIR $ACTIVE_PERL_DIR wget_unpacked $ACTIVE_PERL_URL $DOWNLOAD_DIR $ACTIVE_PERL_DIR
# this is the first of several bad hacks
# it would be much more natural to have a sort of -p flag like for `patch'
# please deuglify me
qpushd $ACTIVE_PERL_DIR
cp -r ActivePerl/Perl/* .
rm -rf ActivePerl
qpopd
fi fi
quiet $INTLTOOL_PERL --help || die "ActivePerl not installed correctly" quiet $INTLTOOL_PERL --help || die "ActivePerl not installed correctly"
} }