Changeset 26846

Timestamp:

2013-02-04T21:40:20+13:00 (11 years ago)

Author:

davidb

Message:

Tightening up of script

Location:

gs3-extensions/android-ndk/trunk/src

Files:

• PERL-CROSS-STAGE1.sh (modified) (2 diffs)
• PERL-CROSS-STAGE2.sh (modified) (2 diffs)

gs3-extensions/android-ndk/trunk/src/PERL-CROSS-STAGE1.sh

@@ -1 +1 @@
 #!/bin/bash
+
+if [ "x$PERLCROSS_HOME" = "x" ] ; then
+  source ./perl-devel.sh
+fi
 
 export HOME=$PERL_CROSS_HOME
@@ -9 +13 @@
 
 cd perl-5.16.0/ \
-  && ./Configure -des -Dprefix=~/hostperl-5.16.0 \
+  && ./Configure -des -Dprefix=$PERL_CROSS_HOME/hostperl-5.16.0 \
   && make \
   && make install \
-  && cd
+  && cd $PERL_CROSS_HOME
 
 /bin/mv perl-5.16.0 perl-5.16.0.host

gs3-extensions/android-ndk/trunk/src/PERL-CROSS-STAGE2.sh

@@ -1 +1 @@
 #!/bin/bash
 
+if [ "x$PERLCROSS_HOME" = "x" ] ; then
+  source ./perl-devel.sh
+fi
+
 export HOME=$PERL_CROSS_HOME
+
+export PATH=$PERL_CROSS_HOME/hostperl-5.16.0/bin:$PATH
+
 
 if [ ! -d perldroid ] ; then
@@ -8 +15 @@
 fi
 
-cd ~/perldroid/libperl/perl-5.16.0/Cross \
+cd $PERL_CROSS_HOME/perldroid/libperl/perl-5.16.0/Cross \
  && ./prepare_perl_from_svn.sh \
- && cd ~/perl-arm-5.16.0-14/Cross/ \
+ \
+ && cd $PERL_CROSS_HOME/perl-arm-5.16.0-14/Cross/ \
  && make -f Makefile.android perl \
- && cd
+ && cd $PERL_CROSS_HOME
 
 echo "****"