diff options
| author | Simon Richter <Simon.Richter@hogyros.de> | 2017-07-16 22:49:36 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2017-07-25 16:35:57 +0200 |
| commit | f794476093342d021176ddac27270bd43ff2c804 (patch) | |
| tree | daaf1c6a8c46bae946b671a43b0deb6d4e44e9a4 /util | |
| parent | 5bb84670ff1cf45e5d997eeaf48f34eab721d01f (diff) | |
Fix installation on VC-WIN32 with nmake
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)
Diffstat (limited to 'util')
| -rwxr-xr-x | util/mk1mf.pl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/util/mk1mf.pl b/util/mk1mf.pl index 490a034e40..6b31496ed1 100755 --- a/util/mk1mf.pl +++ b/util/mk1mf.pl @@ -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 |