[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  986caf9e34fd60366a5b3711bb12e239e43a2431 (commit)
      from  8481434439e421d513350a81a01ba2e2a8e61b6e (commit)


- Log -----------------------------------------------------------------
commit 986caf9e34fd60366a5b3711bb12e239e43a2431
Author: Richard Levitte <levitte at openssl.org>
Date:   Mon May 14 09:28:52 2018 +0200

    CI config: no need to make both install and install_docs
    
    'install' depends on 'install_docs', so making the latter explicit is
    a waste.
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/6250)

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

Summary of changes:
 .travis.yml  | 2 +-
 appveyor.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f23f156..4affefd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -229,7 +229,7 @@ script:
       fi
     - if [ -n "$DESTDIR" ]; then
           mkdir "$top/$DESTDIR";
-          if $make install install_docs DESTDIR="$top/$DESTDIR" >~/install.log 2>&1 ; then
+          if $make install DESTDIR="$top/$DESTDIR" >~/install.log 2>&1 ; then
               echo -e '+\057\057\057\057\057\057\057 MAKE INSTALL OK';
           else
               echo -e '+\057\057\057\057\057\057\057 MAKE INSTALL FAILED';
diff --git a/appveyor.yml b/appveyor.yml
index 3b66f0d..24966c0 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -61,6 +61,6 @@ test_script:
     - ps: >-
         if ($env:EXTENDED_TESTS) {
             mkdir ..\_install
-            cmd /c "nmake install install_docs DESTDIR=..\_install 2>&1"
+            cmd /c "nmake install DESTDIR=..\_install 2>&1"
         }
     - cd ..