escape-openssldir.patch 1.4 KB

1234567891011121314151617181920212223242526272829
  1. diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
  2. index 7db7578a4b..e5ba20b589 100644
  3. --- a/Configurations/unix-Makefile.tmpl
  4. +++ b/Configurations/unix-Makefile.tmpl
  5. @@ -215,6 +215,7 @@ INSTALLTOP_dev={- # $prefix is used in the OPENSSLDIR perl snippet
  6. $prefix_dev -}
  7. INSTALLTOP_dir={- my $x = File::Spec::Win32->canonpath($prefix_dir);
  8. $x =~ s|\\|/|g;
  9. + $x =~ s/([ \(\)])/\\$1/g;
  10. $x -}
  11. OPENSSLDIR_dev={- #
  12. # The logic here is that if no --openssldir was given,
  13. @@ -239,6 +240,7 @@ OPENSSLDIR_dev={- #
  14. $openssldir_dev -}
  15. OPENSSLDIR_dir={- my $x = File::Spec::Win32->canonpath($openssldir_dir);
  16. $x =~ s|\\|/|g;
  17. + $x =~ s/([ \(\)])/\\$1/g;
  18. $x -}
  19. LIBDIR={- our $libdir = $config{libdir} || "lib";
  20. File::Spec::Win32->file_name_is_absolute($libdir) ? "" : $libdir -}
  21. @@ -253,6 +255,7 @@ ENGINESDIR_dev={- use File::Spec::Win32;
  22. $enginesdir_dev -}
  23. ENGINESDIR_dir={- my $x = File::Spec::Win32->canonpath($enginesdir_dir);
  24. $x =~ s|\\|/|g;
  25. + $x =~ s/([ \(\)])/\\$1/g;
  26. $x -}
  27. # In a Windows environment, $(DESTDIR) is harder to contatenate with other
  28. # directory variables, because both may contain devices. What we do here is