From: Richard Levitte <levitte@openssl.org>
Date: Mon, 14 May 2018 07:28:52 +0000 (+0200)
Subject: CI config: no need to make both install and install_docs
X-Git-Tag: OpenSSL_1_1_1-pre7~51
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=986caf9e34fd60366a5b3711bb12e239e43a2431;p=oweals%2Fopenssl.git

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@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6250)
---

diff --git a/.travis.yml b/.travis.yml
index f23f15685d..4affefd5f0 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 3b66f0defb..24966c0faa 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 ..