New commits:
commit 9dea7bb73e89e6ab4d310d2950fca2903c068963
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
perl's custom config would not enable prompts (Bug #10493)
make_single &&
make depend &&
make &&
-make_normal
+make_normal &&
+
+if [[ "$NEW_CUSTOM" == "y" ]]; then
+ cp config.sh $PERL_CONFIG
+fi
diff --git a/perl-cpan/perl/CONFIGURE b/perl-cpan/perl/CONFIGURE
index b5ea553..137ae90 100755
--- a/perl-cpan/perl/CONFIGURE
+++ b/perl-cpan/perl/CONFIGURE
@@ -1,21 +1,21 @@
CONFIG_FILE="$DEPENDS_CONFIG/perl_config.sh" &&
-if [ -f $CONFIG_FILE ]; then
- config_query OLD_CUSTOM "Use old custom configuration for Perl?" y
+if [[ -f $CONFIG_FILE ]]; then
+ config_query OLD_CUSTOM "Use old custom configuration for Perl?" y
- if [ "$OLD_CUSTOM" == "n" ]; then
- config_query RM_OLD_CUSTOM "Remove old custom configuration file ?" n
- fi
+ if [[ "$OLD_CUSTOM" == "n" ]]; then
+ config_query RM_OLD_CUSTOM "Remove old custom configuration file ?" n
+ fi &&
+
+ if [[ "$RM_OLD_CUSTOM" == "y" ]]; then
+ rm "$CONFIG_FILE"
+ fi
else
- OLD_CUSTOM="n"
- RM_OLD_CUSTOM="n"
+ # Just used for the check below
+ local OLD_CUSTOM="n"
fi &&
-if [ "$RM_OLD_CUSTOM" == "y" ]; then
- rm "$CONFIG_FILE"
-fi
-
-if [ ! "$OLD_CUSTOM" == "y" ]; then
+if [[ "$OLD_CUSTOM" == "n" ]]; then
config_query NEW_CUSTOM "New custom configuration for Perl?" n
fi &&
diff --git a/perl-cpan/perl/HISTORY b/perl-cpan/perl/HISTORY
index 7867802..a2e6a52 100644
--- a/perl-cpan/perl/HISTORY
+++ b/perl-cpan/perl/HISTORY
@@ -1,5 +1,12 @@
2007-02-13 Eric Sandall <eric AT sandall.us>
* BUILD: Use make_single (Bug #10392)
+ Do not check for OLD_CUSTOM != 'y' when checking NEW_CUSTOM != 'y',
+ on a 'clean' build OLD_CUSTOM will be unset or 'y', so no point.
+ Rename CONFIG to PERL_CONFIG
+ Make PERL_CONFIG and CONFIG_OPTS local
+ NEW_CUSTOM missing $ for variable (Bug #10493)
+ * CONFIGURE: Set OLD_CUSTOM locally just for the NEW_CUSTOM check
+ Moved the RM_OLD_CUSTOM query inside the check for CONFIG_FILE
2006-10-06 Juuso Alasuutari <iuso AT sourcemage.org>
* perl.sh: Removed bashism.
[SM-Commit] GIT changes to master grimoire by Eric Sandall (9dea7bb73e89e6ab4d310d2950fca2903c068963),
Eric Sandall, 02/13/2007