diff options
Diffstat (limited to 'Configurations/descrip.mms.tmpl')
-rw-r--r-- | Configurations/descrip.mms.tmpl | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl index 892102dd91..e177f2202e 100644 --- a/Configurations/descrip.mms.tmpl +++ b/Configurations/descrip.mms.tmpl @@ -48,26 +48,26 @@ @{$unified_info{libraries}}; our @install_libs = map { platform->staticname($_) } - grep { !$unified_info{attributes}->{$_}->{noinst} } + grep { !$unified_info{attributes}->{libraries}->{$_}->{noinst} } @{$unified_info{libraries}}; our @install_shlibs = map { platform->sharedname($_) // () } - grep { !$unified_info{attributes}->{$_}->{noinst} } + grep { !$unified_info{attributes}->{libraries}->{$_}->{noinst} } @{$unified_info{libraries}}; our @install_engines = - grep { !$unified_info{attributes}->{$_}->{noinst} - && $unified_info{attributes}->{$_}->{engine} } + grep { !$unified_info{attributes}->{modules}->{$_}->{noinst} + && $unified_info{attributes}->{modules}->{$_}->{engine} } @{$unified_info{modules}}; our @install_programs = - grep { !$unified_info{attributes}->{$_}->{noinst} } + grep { !$unified_info{attributes}->{programs}->{$_}->{noinst} } @{$unified_info{programs}}; our @install_bin_scripts = - grep { !$unified_info{attributes}->{$_}->{noinst} - && !$unified_info{attributes}->{$_}->{misc} } + grep { !$unified_info{attributes}->{scripts}->{$_}->{noinst} + && !$unified_info{attributes}->{scripts}->{$_}->{misc} } @{$unified_info{scripts}}; our @install_misc_scripts = - grep { !$unified_info{attributes}->{$_}->{noinst} - && $unified_info{attributes}->{$_}->{misc} } + grep { !$unified_info{attributes}->{scripts}->{$_}->{noinst} + && $unified_info{attributes}->{scripts}->{$_}->{misc} } @{$unified_info{scripts}}; # This is a horrible hack, but is needed because recursive inclusion of files @@ -704,7 +704,7 @@ reconfigure reconf : # On Unix platforms, we depend on {shlibname}.so return map { { lib => platform->sharedlib($_) // platform->staticlib($_), - attrs => $unified_info{attributes}->{$_} } + attrs => $unified_info{attributes}->{libraries}->{$_} } } @_; } @@ -1014,8 +1014,8 @@ EOF } sub obj2dso { my %args = @_; - my $dsoname = platform->dsoname($args{lib}); - my $dso = platform->dso($args{lib}); + my $dsoname = platform->dsoname($args{module}); + my $dso = platform->dso($args{module}); my @objs = map { platform->convertext($_) } grep { platform->isobj($_) } @{$args{objs}}; |