Fix default installation paths on mingw

[openssl.git] / Configurations / 10-main.conf

diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index 8559667b19d8cdae4b5502c4611260efdf8f4eea..b141be52f6d56966b3618ad11744eda8e86b156b 100644 (file)
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -14,7 +14,7 @@ sub vc_win64a_info {
                                 asflags   => "/c /Cp /Cx /Zi",
                                 asoutflag => "/Fo" };
         } else {
-            $die->("NASM not found - please read INSTALL and NOTES.WIN for further details\n");
+            $die->("NASM not found - make sure it's installed and available on %PATH%\n");
             $vc_win64a_info = { as        => "{unknown}",
                                 asflags   => "",
                                 asoutflag => "" };
@@ -39,7 +39,7 @@ sub vc_win32_info {
                                asoutflag => "/Fo",
                                perlasm_scheme => "win32" };
         } else {
-            $die->("NASM not found - please read INSTALL and NOTES.WIN for further details\n");
+            $die->("NASM not found - make sure it's installed and available on %PATH%\n");
             $vc_win32_info = { as        => "{unknown}",
                                asflags   => "",
                                asoutflag => "",
@@ -1210,6 +1210,7 @@ sub vms_info {
         perlasm_scheme   => "aix32",
         dso_scheme       => "dlfcn",
         shared_target    => "aix-shared",
+        shared_cflag     => "-qpic",
         shared_ldflag    => "-q32 -G",
         shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
         arflags          => "-X 32",
@@ -1228,6 +1229,7 @@ sub vms_info {
         perlasm_scheme   => "aix64",
         dso_scheme       => "dlfcn",
         shared_target    => "aix-shared",
+        shared_cflag     => "-qpic",
         shared_ldflag    => "-q64 -G",
         shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
         arflags          => "-X 64",
@@ -1442,6 +1444,7 @@ sub vms_info {
         shared_extension => ".dll",
         multilib         => "",
         apps_aux_src     => add("win32_init.c"),
+        build_scheme     => add("mingw", { separator => undef }),
     },
     "mingw64" => {
         # As for OPENSSL_USE_APPLINK. Applink makes it possible to use
@@ -1471,6 +1474,7 @@ sub vms_info {
         shared_extension => ".dll",
         multilib         => "64",
         apps_aux_src     => add("win32_init.c"),
+        build_scheme     => add("mingw64", { separator => undef }),
     },
 
 #### UEFI