summaryrefslogtreecommitdiff
path: root/modules/AutomakeWorkspaceCreator.pm
diff options
context:
space:
mode:
authorelliott_c <ocielliottc@users.noreply.github.com>2009-12-21 18:57:22 +0000
committerelliott_c <ocielliottc@users.noreply.github.com>2009-12-21 18:57:22 +0000
commit5c692ad1c376d39bd001285a30138e465b41e04d (patch)
tree80e8f8e12530e3431d001636723384bb6c9cc95d /modules/AutomakeWorkspaceCreator.pm
parent828a348990f53046b34cc663f3dc223e01ba0ef6 (diff)
downloadMPC-5c692ad1c376d39bd001285a30138e465b41e04d.tar.gz
ChangeLogTag: Mon Dec 21 18:55:57 UTC 2009 Chad Elliott <elliott_c@ociweb.com>
Diffstat (limited to 'modules/AutomakeWorkspaceCreator.pm')
-rw-r--r--modules/AutomakeWorkspaceCreator.pm5
1 files changed, 3 insertions, 2 deletions
diff --git a/modules/AutomakeWorkspaceCreator.pm b/modules/AutomakeWorkspaceCreator.pm
index 58f9fdbe..e3cdf9c6 100644
--- a/modules/AutomakeWorkspaceCreator.pm
+++ b/modules/AutomakeWorkspaceCreator.pm
@@ -115,6 +115,7 @@ sub write_comps {
my %proj_dir_seen;
my $have_subdirs = 0;
my $outdir = $self->get_outdir();
+ my $cond = '--';
## This step writes a configure.ac.Makefiles list into the starting
## directory. The list contains of all the Makefiles generated down
@@ -145,7 +146,8 @@ sub write_comps {
delete $assoc{$feature};
}
foreach my $akey (keys %assoc) {
- print $acfh 'AM_CONDITIONAL(BUILD_', uc($akey), ', true)', $crlf;
+ print $acfh 'AM_CONDITIONAL(BUILD_', uc($akey), ', true)', $crlf
+ if ($akey ne $cond);
}
print $acfh $crlf,
@@ -346,7 +348,6 @@ sub write_comps {
my $assoc = $self->get_associated_projects();
my @aorder;
my %afiles;
- my $cond = '--';
my $entry = " \\$crlf ";
print $fh 'SUBDIRS =';
foreach my $dir (reverse @dirs) {