Reorganize .gitignore to make better use of its features

[openssl.git] / Configurations / windows-makefile.tmpl

diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl
index fa430b6d6d233c3931ac1ffae3dcb17e8d653df9..c9a7a26f040628bcc4e2ffbc95cfc0dbc4b1614a 100644 (file)
--- a/Configurations/windows-makefile.tmpl
+++ b/Configurations/windows-makefile.tmpl
@@ -11,6 +11,8 @@
  our $shlibextimport = $target{shared_import_extension} || ".lib";
  our $dsoext = $target{dso_extension} || ".dll";
 
+ our $sover = $config{shlib_major}."_".$config{shlib_minor};
+
  my $win_installenv =
      $target{build_scheme}->[2] eq "VC-W32" ?
      "ProgramFiles(x86)" : "ProgramW6432";
@@ -105,7 +107,7 @@ OPENSSLDIR_dev={- #
                   # value appended as a subdirectory.
                   #
                   use File::Spec::Functions qw(:DEFAULT splitpath);
-                  my $openssldir =
+                  our $openssldir =
                       $config{openssldir} ?
                           (file_name_is_absolute($config{openssldir}) ?
                                $config{openssldir}
@@ -118,7 +120,7 @@ OPENSSLDIR_dir={- $openssldir_dir -}
 LIBDIR={- our $libdir = $config{libdir} || "lib";
           $libdir -}
 ENGINESDIR_dev={- use File::Spec::Functions qw(:DEFAULT splitpath);
-                  my $enginesdir = catdir($prefix,$libdir,"engines");
+                  our $enginesdir = catdir($prefix,$libdir,"engines-$sover");
                   our ($enginesdir_dev, $enginesdir_dir, $enginesdir_file) =
                       splitpath($enginesdir, 1);
                   $enginesdir_dev -}
@@ -168,7 +170,7 @@ all: build_generated \
      build_libs_nodep build_engines_nodep build_apps_nodep depend
 
 build_libs: build_generated build_libs_nodep depend
-build_libs_nodep: $(LIBS)
+build_libs_nodep: $(LIBS) {- join(" ",map { shlib_import($_) } @{$unified_info{libraries}}) -}
 build_engines: build_generated build_engines_nodep depend
 build_engines_nodep: $(ENGINES)
 build_apps: build_generated build_apps_nodep depend