diff options
| author | Steve Huston <shuston@riverace.com> | 2008-06-16 16:06:09 +0000 |
|---|---|---|
| committer | Steve Huston <shuston@riverace.com> | 2008-06-16 16:06:09 +0000 |
| commit | 3f342c306d64dbe98b70a1ab3dd85ab1f38c014f (patch) | |
| tree | 1a76be0f6297887cb78dde6fc88f7e338ec910fd | |
| parent | 70ac3aa53121d45ab2cce9b07fd72f901b735443 (diff) | |
| download | ATCD-3f342c306d64dbe98b70a1ab3dd85ab1f38c014f.tar.gz | |
ChangeLogTag:Mon Jun 16 16:04:40 2008 Steve Huston <shuston@riverace.com>
| -rw-r--r-- | ACE/ChangeLog | 6 | ||||
| -rw-r--r-- | ACE/bin/PerlACE/TestTarget.pm | 3 |
2 files changed, 7 insertions, 2 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 7a294450857..d986033b00e 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,9 @@ +Mon Jun 16 16:04:40 2008 Steve Huston <shuston@riverace.com> + + * bin/PerlACE/TestTarget.pm: When getting the exe subdir for a + target, pick up the command line setting if the "default" target + is in use. This should fix the broken exesubdir TAO builds. + Mon Jun 16 15:45:45 UTC 2008 Jeff Parsons <j.parsons@vanderbilt.edu> * ace/Monitor_Control/Null_Network_Interface_Monitor.cpp: diff --git a/ACE/bin/PerlACE/TestTarget.pm b/ACE/bin/PerlACE/TestTarget.pm index 26edc085e5b..9f64eb39185 100644 --- a/ACE/bin/PerlACE/TestTarget.pm +++ b/ACE/bin/PerlACE/TestTarget.pm @@ -22,7 +22,6 @@ sub create_target my $target = undef; my $envname = "DOC_TEST_\U$component"; if (!exists $ENV{$envname}) { - print "$component has no config name\n"; $target = new PerlACE::TestTarget("default"); return $target; } @@ -107,7 +106,7 @@ sub GetConfigSettings ($) # If no ExeSubDir given via env variable, and this is an unnamed # config, allow use of the subdir specified on the command line. # This preserves historical behavior. - if (defined $config_name) { + if (defined $config_name && $config_name ne 'default') { $self->{EXE_SUBDIR} = './'; } else { |