Fix installation on VC-WIN32 with nmake
authorSimon Richter <Simon.Richter@hogyros.de>
Sun, 16 Jul 2017 20:49:36 +0000 (22:49 +0200)
committerRichard Levitte <levitte@openssl.org>
Tue, 25 Jul 2017 14:35:57 +0000 (16:35 +0200)
Commit b83265697 fixed whitespace handling in the copy script, which
exposes bugs in the install routine for nmake Makefiles.

This corrects the quoting around the copy invocation for the openssl.exe
binary.

CLA: trivial

Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3942)

util/mk1mf.pl

index 490a034e4037e6d8eb35706914b46a5eca3acfb1..6b31496ed1e694ff2bba7044dace14dc99a095fc 100755 (executable)
@@ -428,7 +428,7 @@ EOF
                {
                $extra_install .= <<"EOF"
        \$(MKDIR) \"\$(INSTALLTOP)${o}lib${o}engines\"
-       \$(CP) \"\$(E_SHLIB)\" \"\$(INSTALLTOP)${o}lib${o}engines\"
+       \$(CP) \$(E_SHLIB) \"\$(INSTALLTOP)${o}lib${o}engines\"
 EOF
                }
        }
@@ -608,7 +608,7 @@ install: all
        \$(MKDIR) \"\$(INSTALLTOP)${o}include${o}openssl\"
        \$(MKDIR) \"\$(INSTALLTOP)${o}lib\"
        \$(CP) \"\$(INCO_D)${o}*.\[ch\]\" \"\$(INSTALLTOP)${o}include${o}openssl\"
-       \$(CP) \"\$(BIN_D)$o\$(E_EXE)$exep \$(INSTALLTOP)${o}bin\"
+       \$(CP) \"\$(BIN_D)$o\$(E_EXE)$exep\" \"\$(INSTALLTOP)${o}bin\"
        \$(MKDIR) \"\$(OPENSSLDIR)\"
        \$(CP) apps${o}openssl.cnf \"\$(OPENSSLDIR)\"
 $extra_install