Allow setting a NULL pointer in a params structure

[openssl.git] / Configurations / descrip.mms.tmpl

diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl
index e177f2202ee12063d828f2ba6bd6c829eaed1cbd..28e7663a54f5ed2462e09fcf7c8e1a1f65c1a020 100644 (file)
--- a/Configurations/descrip.mms.tmpl
+++ b/Configurations/descrip.mms.tmpl
@@ -775,10 +775,14 @@ EOF
              my $dofile = abs2rel(rel2abs(catfile($config{sourcedir},
                                                    "util", "dofile.pl")),
                                    rel2abs($config{builddir}));
+              my @modules = ( 'configdata.pm',
+                              grep { $_ =~ m|\.pm$| } @{$args{deps}} );
+              my %moduleincs = map { '"-I'.dirname($_).'"' => 1 } @modules;
+              @modules = map { '"-M'.basename($_, '.pm').'"' } @modules;
+              my $modules = join(' ', '', sort keys %moduleincs, @modules);
               return <<"EOF";
 $target : $args{generator}->[0] $deps
-       \$(PERL) "-I\$(BLDDIR)" "-Mconfigdata" $dofile \\
-           "-o$target{build_file}" $generator > \$\@
+       \$(PERL)$modules $dofile "-o$target{build_file}" $generator > \$\@
 EOF
          } else {
               return <<"EOF";