Android build: fix usage of NDK home variable ($ndk_var)

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

diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl
index e114d6b279f90d25ee3d952caa5f4ca117f05af3..0cd1e863d3acd484e582838f362461f5e5e335af 100644 (file)
--- a/Configurations/windows-makefile.tmpl
+++ b/Configurations/windows-makefile.tmpl
@@ -97,10 +97,18 @@ INSTALL_PROGRAMPDBS={-
                   grep { !$unified_info{attributes}->{$_}->{noinst} }
                   @{$unified_info{programs}})
 -}
-{- output_off() if $disabled{apps}; "" -}
-BIN_SCRIPTS="$(BLDDIR)\tools\c_rehash.pl"
-MISC_SCRIPTS="$(BLDDIR)\apps\CA.pl" "$(BLDDIR)\apps\tsget.pl"
-{- output_on() if $disabled{apps}; "" -}
+BIN_SCRIPTS={-
+        join(" ", map { quotify1($_) }
+                  grep { !$unified_info{attributes}->{$_}->{noinst}
+                         && !$unified_info{attributes}->{$_}->{misc} }
+                  @{$unified_info{scripts}})
+-}
+MISC_SCRIPTS={-
+        join(" ", map { quotify1($_) }
+                  grep { !$unified_info{attributes}->{$_}->{noinst}
+                         && $unified_info{attributes}->{$_}->{misc} }
+                  @{$unified_info{scripts}})
+-}
 
 APPS_OPENSSL={- use File::Spec::Functions;
                 "\"".catfile("apps","openssl")."\"" -}
@@ -605,6 +613,7 @@ $res: $deps
 EOF
      }
      my $obj = platform->obj($args{obj});
+     my $dep = platform->dep($args{obj});
      if ($srcs[0] =~ /\.asm$/) {
          return <<"EOF";
 $obj: $deps