[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  4b799ceaa2e7e8cace68813f469ccc1cb0a3be64 (commit)
      from  98ac876f2ded90de8c9d9bc9d7b33a965f7d9f9a (commit)


- Log -----------------------------------------------------------------
commit 4b799ceaa2e7e8cace68813f469ccc1cb0a3be64
Author: Richard Levitte <levitte at openssl.org>
Date:   Sun Feb 14 06:55:45 2016 +0100

    Have dofile.pl say where it was run
    
    Reviewed-by: Viktor Dukhovni <viktor at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 Configurations/descrip.mms.tmpl   | 3 ++-
 Configurations/unix-Makefile.tmpl | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl
index d449a42..1091952 100644
--- a/Configurations/descrip.mms.tmpl
+++ b/Configurations/descrip.mms.tmpl
@@ -629,7 +629,8 @@ EOF
                            rel2abs($config{builddir}));
       return <<"EOF";
 $script : $sources
-        \$(PERL) "-I\$(BUILDDIR)" "-Mconfigdata" $dofile $sources > $script
+        \$(PERL) "-I\$(BUILDDIR)" "-Mconfigdata" $dofile -
+	    "-o{- $config{build_file} -}" $sources > $script
         SET FILE/PROT=(S:RWED,O:RWED,G:RE,W:RE) $script
         PURGE $script
 EOF
diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index fe524e1..5b34df5 100644
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -882,7 +882,8 @@ EOF
                            rel2abs($config{builddir}));
       return <<"EOF";
 $script : $sources
-	\$(PERL) "-I\$(BLDDIR)" -Mconfigdata "$dofile" $sources > "$script"
+	\$(PERL) "-I\$(BLDDIR)" -Mconfigdata "$dofile" \\
+	    "-o{- $config{build_file} -}" $sources > "$script"
 	chmod a+x $script
 EOF
   }