diff options
| author | marha <marha@users.sourceforge.net> | 2012-06-15 14:13:55 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-06-15 14:13:55 +0200 |
| commit | 1501699f035761714a1d4540d65a1afb7c567abe (patch) | |
| tree | 4dd4d15583d9d542a699833331f34ceb10bbd6c3 /openssl/Configure | |
| parent | 38c18d1733e4eb5cc560a34bfe2470e01a06205d (diff) | |
| parent | a33de30073bfa0ee1abba186dba9fa52cf0aa23a (diff) | |
| download | vcxsrv-1501699f035761714a1d4540d65a1afb7c567abe.tar.gz vcxsrv-1501699f035761714a1d4540d65a1afb7c567abe.tar.bz2 vcxsrv-1501699f035761714a1d4540d65a1afb7c567abe.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
freetype/src/raster/ftraster.c
openssl/Makefile
Diffstat (limited to 'openssl/Configure')
| -rw-r--r-- | openssl/Configure | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/openssl/Configure b/openssl/Configure index 4755cd9d0..a5b733d54 100644 --- a/openssl/Configure +++ b/openssl/Configure @@ -904,11 +904,11 @@ PROCESS_ARGS: } elsif (/^--with-fipsdir=(.*)$/) { - $fipsdir="$1/"; + $fipsdir="$1"; } elsif (/^--with-fipslibdir=(.*)$/) { - $fipslibdir="$1/"; + $fipslibdir="$1"; } elsif (/^--with-baseaddr=(.*)$/) { |