r15582 - gnucash/trunk/packaging/win32 - Do not move unzipped folders of ActivePerl.

[Andreas Köhler]

Author: andi5
Date: 2007-02-15 16:09:59 -0500 (Thu, 15 Feb 2007)
New Revision: 15582
Trac: http://svn.gnucash.org/trac/changeset/15582

Modified:
   gnucash/trunk/packaging/win32/install.sh
Log:
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.


Modified: gnucash/trunk/packaging/win32/install.sh
===================================================================
--- gnucash/trunk/packaging/win32/install.sh	2007-02-15 20:22:49 UTC (rev 15581)
+++ gnucash/trunk/packaging/win32/install.sh	2007-02-15 21:09:59 UTC (rev 15582)
@@ -172,19 +172,12 @@
 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"
 }