|
|
|
|
Index: Configurations/unix-Makefile.tmpl
|
|
|
|
|
--- Configurations/unix-Makefile.tmpl.orig 2019-09-10 15:13:07.000000000 +0200
|
|
|
|
|
+++ Configurations/unix-Makefile.tmpl 2019-09-11 07:48:48.831842000 +0200
|
|
|
|
|
@@ -191,7 +191,7 @@
|
|
|
|
|
# $(libdir) is chosen to be compatible with the GNU coding standards
|
|
|
|
|
libdir={- file_name_is_absolute($libdir)
|
|
|
|
|
? $libdir : '$(INSTALLTOP)/$(LIBDIR)' -}
|
|
|
|
|
-ENGINESDIR=$(libdir)/engines-{- $sover_dirname -}
|
|
|
|
|
+ENGINESDIR=$(libdir)/openssl/engines
|
|
|
|
|
|
|
|
|
|
# Convenience variable for those who want to set the rpath in shared
|
|
|
|
|
# libraries and applications
|
|
|
|
|
@@ -274,8 +274,8 @@
|
|
|
|
|
? $libdir : '$(INSTALLTOP)/$(LIBDIR)' -}
|
|
|
|
|
{- output_on() if $config{target} !~ /^mingw/; "" -}
|
|
|
|
|
|
|
|
|
|
-MANDIR=$(INSTALLTOP)/share/man
|
|
|
|
|
-DOCDIR=$(INSTALLTOP)/share/doc/$(BASENAME)
|
|
|
|
|
+MANDIR=$(INSTALLTOP)/man
|
|
|
|
|
+DOCDIR=$(INSTALLTOP)/share/openssl/doc/$(BASENAME)
|
|
|
|
|
HTMLDIR=$(DOCDIR)/html
|
|
|
|
|
|
|
|
|
|
# MANSUFFIX is for the benefit of anyone who may want to have a suffix
|
|
|
|
|
@@ -544,7 +544,7 @@
|
|
|
|
|
|
|
|
|
|
uninstall_sw: uninstall_runtime uninstall_engines uninstall_dev
|
|
|
|
|
|
|
|
|
|
-install_docs: install_man_docs install_html_docs
|
|
|
|
|
+install_docs: install_man_docs
|
|
|
|
|
|
|
|
|
|
uninstall_docs: uninstall_man_docs uninstall_html_docs
|
|
|
|
|
$(RM) -r $(DESTDIR)$(DOCDIR)
|
|
|
|
|
@@ -960,7 +960,7 @@
|
|
|
|
|
echo 'libdir=$(libdir)'; \
|
|
|
|
|
fi; \
|
|
|
|
|
echo 'includedir=$${prefix}/include'; \
|
|
|
|
|
- echo 'enginesdir=$${libdir}/engines-{- $sover_dirname -}'; \
|
|
|
|
|
+ echo 'enginesdir=$${libdir}/openssl/engines'; \
|
|
|
|
|
echo ''; \
|
|
|
|
|
echo 'Name: OpenSSL-libcrypto'; \
|
|
|
|
|
echo 'Description: OpenSSL cryptography library'; \
|
|
|
|
|
Index: util/process_docs.pl
|
|
|
|
|
--- util/process_docs.pl.orig 2019-09-10 15:13:07.000000000 +0200
|
|
|
|
|
+++ util/process_docs.pl 2019-09-11 07:47:32.047435000 +0200
|
|
|
|
|
@@ -78,7 +78,7 @@
|
|
|
|
|
if defined $options{"dry-run"};
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
-my $symlink_exists = eval { symlink("",""); 1 };
|
|
|
|
|
+my $link_exists = eval { link("",""); 1 };
|
|
|
|
|
|
|
|
|
|
foreach my $section (sort @{$options{section}}) {
|
|
|
|
|
my $subdir = "man$section";
|
|
|
|
|
@@ -170,11 +170,11 @@
|
|
|
|
|
my $link_file = $_ . $suffix;
|
|
|
|
|
my $link_path = catfile($output_dir, $link_file);
|
|
|
|
|
if (! $options{remove}) {
|
|
|
|
|
- if ($symlink_exists) {
|
|
|
|
|
+ if ($link_exists) {
|
|
|
|
|
print STDERR "DEBUG: Linking $link_path -> $output_file\n"
|
|
|
|
|
if $options{debug};
|
|
|
|
|
unless ($options{"dry-run"}) {
|
|
|
|
|
- symlink $output_file, $link_path;
|
|
|
|
|
+ link $output_file, $link_path;
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
print STDERR "DEBUG: Copying $output_path to link_path\n"
|
