Index: Configurations/unix-Makefile.tmpl
--- Configurations/unix-Makefile.tmpl.orig	2021-09-07 13:46:32.000000000 +0200
+++ Configurations/unix-Makefile.tmpl	2021-09-12 10:37:40.096558000 +0200
@@ -303,15 +303,15 @@
 # $(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)/engines
 MODULESDIR=$(libdir)/ossl-modules
 
 # Convenience variable for those who want to set the rpath in shared
 # libraries and applications
 LIBRPATH=$(libdir)
 
-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
@@ -609,7 +609,7 @@
 
 uninstall_sw: uninstall_runtime uninstall_modules 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)
@@ -1395,7 +1395,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'; \