From 22a6238170a2f0502d57ee5405cd16a6e5060a25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20K=C3=B6hler?= Date: Thu, 15 Feb 2007 21:09:59 +0000 Subject: [PATCH] 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 --- packaging/win32/install.sh | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/packaging/win32/install.sh b/packaging/win32/install.sh index 1d3e4444db..8789ee7fba 100644 --- a/packaging/win32/install.sh +++ b/packaging/win32/install.sh @@ -172,19 +172,12 @@ function inst_readline() { function inst_active_perl() { setup ActivePerl \(intltool\) _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 then echo "ActivePerl already installed. skipping." else 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 quiet $INTLTOOL_PERL --help || die "ActivePerl not installed correctly" }