Do-compile:

 - "--config-env" can now be given more than once
 - don't be smart about version suffixes


Build-tools/Do-compile:
   - "--config-env" can now be given more than once
   - don't be smart about version suffixes

1 files changed, 7 insertions, 6 deletions

diff --git a/Build-tools/Do-compile b/Build-tools/Do-compile
index 367911bb252..51ff8105b3b 100755
--- a/Build-tools/Do-compile
+++ b/Build-tools/Do-compile
@@ -14,7 +14,7 @@ $opt_innodb=$opt_bdb=$opt_raid=$opt_libwrap=0;
 GetOptions(
 	"bdb",
 	"build-thread=i",
-	"config-env=s",
+	"config-env=s" => \@config_env,
 	"config-options=s" => \@config_options,
 	"dbd-options=s",
 	"debug",
@@ -53,11 +53,6 @@ GetOptions(
 usage() if ($opt_help);
 usage() if (!$opt_distribution);
 
-if ($opt_bdb && $opt_version_suffix eq "")
-{
-  $opt_version_suffix="-max";
-}
-
 if (@make_options > 0)
 {
 	chomp(@make_options);
@@ -70,6 +65,12 @@ if (@config_options > 0)
 	$opt_config_options= join(" ", @config_options);
 }
 
+if (@config_env > 0)
+{
+	chomp(@config_env);
+	$opt_config_env= join(" ", @config_env);
+}
+
 chomp($host=`hostname`);
 $full_host_name=$host;
 $connect_option= ($opt_tcpip ? "--host=$host" : "");