Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

* applied another patch from Axel to fix Makefile.PL

git-svn-id: svn://svn.tt2.org/tt/Template2/trunk@686 d5a88997-0a34-4036-9ed2-92fb5d660d91
  • Loading branch information...
commit 193ba4e07a7374de2354839736b1eddf75a44539 1 parent 174e886
Andy Wardley authored

Showing 1 changed file with 16 additions and 7 deletions. Show diff stats Hide diff stats

  1. +16 7 Makefile.PL
23 Makefile.PL
@@ -498,15 +498,21 @@ EOF
498 498 $TT_XS_ENABLE) =~ /^y/i);
499 499
500 500 if ($TT_XS_ENABLE) {
501   -
502   - $TT_XS_DEFAULT = (ttprompt('Do you want to use the XS Stash for all Templates?',
  501 + $TT_XS_DEFAULT =
  502 + (ttprompt('Do you want to use the XS Stash for all Templates?',
503 503 $TT_XS_DEFAULT) =~ /^y/i);
  504 + }
  505 + else {
  506 + # If the XS stash is disabled, we cannot use it as the default stash.
  507 + $TT_XS_DEFAULT = 0;
  508 + }
504 509
  510 + # Actually, we would have to fix 'Config.pm' only if the XS stash is
  511 + # disabled. But this way, we are sure the correct module is used.
505 512 fix_file(catfile('lib','Template','Config.pm'),
506 513 '$STASH',
507 514 $TT_XS_DEFAULT ? 'Template::Stash::XS' : 'Template::Stash');
508 515 }
509   -}
510 516
511 517
512 518 #------------------------------------------------------------------------
@@ -604,7 +610,9 @@ specify a separate directory for them.
604 610
605 611 EOF
606 612
607   - if (ttprompt('Do you want to install these components?', $TT_EXTRAS) =~ /^y/i) {
  613 + if ($TT_EXTRAS = (
  614 + ttprompt('Do you want to install these components?',
  615 + $TT_EXTRAS) =~ /^y/i)) {
608 616 message(<<EOF);
609 617
610 618 You can chose any directory for the installation of the additional
@@ -892,18 +900,19 @@ EOF
892 900
893 901 sub write_defaults {
894 902 open(FP, "> $DEFAULTS_FILE") || die "$DEFAULTS_FILE: $!\n";
895   - my ( $ttdbi, $ttdocs, $ttsplash, $ttex,
  903 + my ( $ttdbi, $ttdocs, $ttsplash, $ttexamples, $ttextras,
896 904 $ttlatex, $ttxs_enable, $ttxs_default )
897 905 = map { $_ ? 'y' : 'n' }
898 906 ( $TT_RUN_DBI, $TT_BUILD_DOCS, $TT_SPLASH_DOCS, $TT_EXAMPLES,
899   - $TT_LATEX_ENABLE, $TT_XS_ENABLE, $TT_XS_DEFAULT );
  907 + $TT_EXTRAS, $TT_LATEX_ENABLE, $TT_XS_ENABLE, $TT_XS_DEFAULT );
900 908 print FP <<EOF;
901 909 \$TT_PREFIX = '$TT_PREFIX';
902 910 \$TT_IMAGES = '$TT_IMAGES';
903 911 \$TT_RUN_DBI = '$ttdbi';
904 912 \$TT_BUILD_DOCS = '$ttdocs';
905 913 \$TT_SPLASH_DOCS = '$ttsplash';
906   -\$TT_EXAMPLES = '$ttex';
  914 +\$TT_EXAMPLES = '$ttexamples';
  915 +\$TT_EXTRAS = '$ttextras';
907 916 \$TT_SPLASH_THEME = '$TT_SPLASH_THEME';
908 917 \$TT_LATEX_ENABLE = '$ttlatex';
909 918 \$TT_LATEX_PATH = '$TT_LATEX_PATH';

0 comments on commit 193ba4e

Please sign in to comment.
Something went wrong with that request. Please try again.