[ViewVC] Diff of: cvs/cvsroot/App-Staticperl/staticperl.sh

Comparing cvsroot/App-Staticperl/staticperl.sh (file contents):
Revision 1.9 by root, Tue Dec 7 20:03:15 2010 UTC vs.
Revision 1.10 by root, Tue Dec 7 21:22:12 2010 UTC

 #############################################################################
 # support
 # set version in a way that Makefile.PL can extract
 VERSION=VERSION; eval \
-$VERSION=0.1
+$VERSION=0.2
 BZ2=bz2
 BZIP2=bzip2
 fatal() {
       rcd "$PERL_PREFIX"
       # create a "make install" replacement for CPAN
       cat >"$PERL_PREFIX"/bin/cpan-make-install <<EOF
-make install UNINST=1
+make || exit
 if find blib/arch/auto -type f | grep -q -v .exists; then
    echo Probably an XS module, rebuilding perl
-   make perl
+   if make perl; then
-   rm -f "$PERL_PREFIX"/bin/perl
+      mv perl "$PERL_PREFIX"/bin/perl
-   make -f Makefile.aperl inst_perl
-   make -f Makefile.aperl map_clean
+      make -f Makefile.aperl map_clean
+   else
+      make -f Makefile.aperl map_clean
+      exit 1
+   fi
 fi
+make install UNINST=1
 EOF
       chmod 755 "$PERL_PREFIX"/bin/cpan-make-install
       # trick CPAN into avoiding ~/.cpan completely
       echo 1 >"$PERL_PREFIX/lib/CPAN/MyConfig.pm"
       ' || fatal "error while initialising CPAN"
       touch "$PERL_PREFIX/staticstamp.install"
    fi
-   if ! [ -e "$PERL_PREFIX/staticstamp.postinstall"; then
+   if ! [ -e "$PERL_PREFIX/staticstamp.postinstall" ]; then
       NOCHECK_INSTALL=+
       instcpan $STATICPERL_MODULES
       [ $EXTRA_MODULES ] && instcpan $EXTRA_MODULES
       postinstall || fatal "postinstall hook failed"

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines