Reduce optimization in hppa builds
[openssl.git] / Configurations / unix-Makefile.tmpl
index c74d539f4a38f16ff91a72bea84dca7f8276a02e..4c24cae7ab62ee9e0e16b8a66b71fdf24dd5d488 100644 (file)
      sub windowsdll { $config{target} =~ /^(?:Cygwin|mingw)/ }
 
      # Shared AIX support is special. We put libcrypto[64].so.ver into
-     # libcrypto.a and use libcrypto_a.a as static one.
-     sub sharedaix  { !$disabled{shared} && $config{target} =~ /^aix/ }
+     # libcrypto.a and use libcrypto_a.a as static one, unless using
+     # shared_target style aix-solib.  In that mode, create
+     # libcrypto.so as a link-import library that inserts runtime
+     # dependencies on libcrypto.so.ver, and the static library is
+     # named libcrypto.a.
+     sub sharedaix  { !$disabled{shared} && $target{shared_target} =~ /^aix(?!-solib$)/ }
+     sub sharedaix_solib  { !$disabled{shared} && $target{shared_target} =~ /^aix-solib$/ }
 
      our $sover_dirname = platform->shlib_version_as_filename();
 
@@ -20,8 +25,9 @@
      # to. You're welcome.
      sub dependmagic {
          my $target = shift;
+         my $help = shift;
 
-         return "$target: build_generated\n\t\$(MAKE) depend && \$(MAKE) _$target\n_$target";
+         return "$target: build_generated ## $help\n\t\"\$(MAKE)\" depend && \"\$(MAKE)\" _$target\n_$target";
      }
 
      our $COLUMNS = $ENV{COLUMNS};
@@ -198,6 +204,18 @@ INSTALL_PROGRAMS={-
                         grep { !$unified_info{attributes}->{programs}->{$_}->{noinst} }
                         @{$unified_info{programs}}))
 -}
+INSTALL_EXPORTERS_PKGCONFIG={-
+        join(" \\\n" . ' ' x 28,
+             fill_lines(" ", $COLUMNS - 28,
+                        grep { $unified_info{attributes}->{generate}->{$_}->{exporter} eq 'pkg-config'}
+                        sort keys %{$unified_info{generate}}))
+-}
+INSTALL_EXPORTERS_CMAKE={-
+        join(" \\\n" . ' ' x 24,
+             fill_lines(" ", $COLUMNS - 24,
+                        grep { $unified_info{attributes}->{generate}->{$_}->{exporter} eq 'cmake'}
+                        sort keys %{$unified_info{generate}}))
+-}
 BIN_SCRIPTS={-
         join(" \\\n" . ' ' x 12,
              fill_lines(" ", $COLUMNS - 12,
@@ -311,6 +329,17 @@ MODULESDIR=$(libdir)/ossl-modules
 # libraries and applications
 LIBRPATH=$(libdir)
 
+BINDIR={- our $bindir = $config{bindir};
+          unless ($bindir) {
+              $bindir = "bin$target{multibin}";
+          }
+          file_name_is_absolute($bindir) ? "" : $bindir -}
+bindir={- file_name_is_absolute($bindir)
+          ? $bindir : '$(INSTALLTOP)/$(BINDIR)' -}
+
+PKGCONFIGDIR=$(libdir)/pkgconfig
+CMAKECONFIGDIR=$(libdir)/cmake/OpenSSL
+
 MANDIR=$(INSTALLTOP)/share/man
 DOCDIR=$(INSTALLTOP)/share/doc/$(BASENAME)
 HTMLDIR=$(DOCDIR)/html
@@ -496,18 +525,23 @@ LANG=C
 
 # The main targets ###################################################
 
-{- dependmagic('build_sw'); -}: build_libs_nodep build_modules_nodep build_programs_nodep link-utils
-{- dependmagic('build_libs'); -}: build_libs_nodep
-{- dependmagic('build_modules'); -}: build_modules_nodep
-{- dependmagic('build_programs'); -}: build_programs_nodep
+##@ Software
+
+{- dependmagic('build_sw', 'Build all the software (default target)'); -}: build_libs_nodep build_modules_nodep build_programs_nodep link-utils
+{- dependmagic('build_libs', 'Build the libraries libssl and libcrypto'); -}: build_libs_nodep
+{- dependmagic('build_modules', 'Build the modules (i.e. providers and engines)'); -}: build_modules_nodep
+{- dependmagic('build_programs', 'Build the openssl executables and scripts'); -}: build_programs_nodep
+
+all: build_sw {- "build_docs" if !$disabled{docs}; -} ## Build software and documentation
 
+##@ Documentation
 build_generated_pods: $(GENERATED_PODS)
-build_docs: build_man_docs build_html_docs
-build_man_docs: $(MANDOCS1) $(MANDOCS3) $(MANDOCS5) $(MANDOCS7)
-build_html_docs: $(HTMLDOCS1) $(HTMLDOCS3) $(HTMLDOCS5) $(HTMLDOCS7)
+build_docs: build_man_docs build_html_docs ## Create documentation
+build_man_docs: $(MANDOCS1) $(MANDOCS3) $(MANDOCS5) $(MANDOCS7) ## Create manpages
+build_html_docs: $(HTMLDOCS1) $(HTMLDOCS3) $(HTMLDOCS5) $(HTMLDOCS7) ## Create HTML documentation
 
 build_generated: $(GENERATED_MANDATORY)
-build_libs_nodep: libcrypto.pc libssl.pc openssl.pc
+build_libs_nodep: $(LIBS) {- join(" ",map { platform->sharedlib_simple($_) // platform->sharedlib_import($_) // platform->sharedlib($_) // () } @{$unified_info{libraries}}) -}
 build_modules_nodep: $(MODULES)
 build_programs_nodep: $(PROGRAMS) $(SCRIPTS)
 
@@ -523,11 +557,16 @@ build_all_generated: $(GENERATED_MANDATORY) $(GENERATED) build_docs
        @echo "         then make will fail..."
        @ : {- output_on() if $disabled{makedepend}; "" -}
 
-all: build_sw build_docs
+##@ Help
+.PHONY: help
+help: ## Show this help screen
+       @$(PERL) $(SRCDIR)/util/help.pl $(BLDDIR)/Makefile
 
-test: tests
-{- dependmagic('tests'); -}: build_programs_nodep build_modules_nodep link-utils run_tests
-run_tests:
+##@ Testing
+test: tests ## Run tests (alias of "tests")
+{- dependmagic('tests', 'Run tests'); -}: build_programs_nodep build_modules_nodep link-utils
+       "$(MAKE)" run_tests
+run_tests: FORCE
        @ : {- output_off() if $disabled{tests}; "" -}
        ( SRCTOP=$(SRCDIR) \
          BLDTOP=$(BLDDIR) \
@@ -539,16 +578,14 @@ run_tests:
        @echo "Tests are not supported with your chosen Configure options"
        @ : {- output_on() if !$disabled{tests}; "" -}
 
-list-tests:
+list-tests: ## List available tests that can be invoked via "make test TESTS=<name>"
        @ : {- output_off() if $disabled{tests}; "" -}
-       $(MAKE) run_tests TESTS=list
+       "$(MAKE)" run_tests TESTS=list
        @ : {- if ($disabled{tests}) { output_on(); } else { output_off(); } "" -}
        @echo "Tests are not supported with your chosen Configure options"
        @ : {- output_on() if !$disabled{tests}; "" -}
 
-install: install_sw install_ssldirs install_docs {- $disabled{fips} ? "" : "install_fips" -}
-
-uninstall: uninstall_docs uninstall_sw {- $disabled{fips} ? "" : "uninstall_fips" -}
+##@ Workspace cleaning
 
 libclean:
        @set -e; for s in $(SHLIB_INFO); do \
@@ -573,7 +610,7 @@ libclean:
        $(RM) $(LIBS)
        $(RM) *{- platform->defext() -}
 
-clean: libclean
+clean: libclean ## Clean the workspace, keep the configuration
        $(RM) $(HTMLDOCS1)
        $(RM) $(HTMLDOCS3)
        $(RM) $(HTMLDOCS5)
@@ -590,10 +627,9 @@ clean: libclean
        $(RM) tags TAGS doc-nits md-nits
        $(RM) -r test/test-runs
        $(RM) providers/fips*.new
-       $(RM) openssl.pc libcrypto.pc libssl.pc
        -find . -type l \! -name '.*' -exec $(RM) {} \;
 
-distclean: clean
+distclean: clean ## Clean and remove the configuration
        $(RM) include/openssl/configuration.h
        $(RM) configdata.pm
        $(RM) Makefile
@@ -606,36 +642,41 @@ depend: Makefile
        @: {- output_on() if $disabled{makedepend}; "" -}
 
 # Install helper targets #############################################
+##@ Installation
+
+install: install_sw install_ssldirs {- "install_docs" if !$disabled{docs}; -} {- $disabled{fips} ? "" : "install_fips" -} ## Install software and documentation, create OpenSSL directories
 
-install_sw: install_dev install_engines install_modules install_runtime
+uninstall: {- "uninstall_docs" if !$disabled{docs}; -} uninstall_sw {- $disabled{fips} ? "" : "uninstall_fips" -} ## Uninstall software and documentation
 
-uninstall_sw: uninstall_runtime uninstall_modules uninstall_engines uninstall_dev
+install_sw: install_dev install_engines install_modules install_runtime ## Install just the software and libraries
 
-install_docs: install_man_docs install_html_docs
+uninstall_sw: uninstall_runtime uninstall_modules uninstall_engines uninstall_dev ## Uninstall the software and libraries
 
-uninstall_docs: uninstall_man_docs uninstall_html_docs
-       $(RM) -r $(DESTDIR)$(DOCDIR)
+install_docs: install_man_docs install_html_docs ## Install manpages and HTML documentation
+
+uninstall_docs: uninstall_man_docs uninstall_html_docs ## Uninstall manpages and HTML documentation
+       $(RM) -r "$(DESTDIR)$(DOCDIR)"
 
 {- output_off() if $disabled{fips}; "" -}
 install_fips: build_sw $(INSTALL_FIPSMODULECONF)
        @[ -n "$(INSTALLTOP)" ] || (echo INSTALLTOP should not be empty; exit 1)
-       @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(MODULESDIR)
-       @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(OPENSSLDIR)
+       @$(PERL) $(SRCDIR)/util/mkdir-p.pl "$(DESTDIR)$(MODULESDIR)"
+       @$(PERL) $(SRCDIR)/util/mkdir-p.pl "$(DESTDIR)$(OPENSSLDIR)"
        @$(ECHO) "*** Installing FIPS module"
        @$(ECHO) "install $(INSTALL_FIPSMODULE) -> $(DESTDIR)$(MODULESDIR)/$(FIPSMODULENAME)"
-       @cp "$(INSTALL_FIPSMODULE)" $(DESTDIR)$(MODULESDIR)/$(FIPSMODULENAME).new
-       @chmod 755 $(DESTDIR)$(MODULESDIR)/$(FIPSMODULENAME).new
-       @mv -f $(DESTDIR)$(MODULESDIR)/$(FIPSMODULENAME).new \
-              $(DESTDIR)$(MODULESDIR)/$(FIPSMODULENAME)
+       @cp "$(INSTALL_FIPSMODULE)" "$(DESTDIR)$(MODULESDIR)/$(FIPSMODULENAME).new"
+       @chmod 755 "$(DESTDIR)$(MODULESDIR)/$(FIPSMODULENAME).new"
+       @mv -f "$(DESTDIR)$(MODULESDIR)/$(FIPSMODULENAME).new" \
+              "$(DESTDIR)$(MODULESDIR)/$(FIPSMODULENAME)"
        @$(ECHO) "*** Installing FIPS module configuration"
        @$(ECHO) "install $(INSTALL_FIPSMODULECONF) -> $(DESTDIR)$(OPENSSLDIR)/fipsmodule.cnf"
-       @cp $(INSTALL_FIPSMODULECONF) $(DESTDIR)$(OPENSSLDIR)/fipsmodule.cnf
+       @cp $(INSTALL_FIPSMODULECONF) "$(DESTDIR)$(OPENSSLDIR)/fipsmodule.cnf"
 
 uninstall_fips:
        @$(ECHO) "*** Uninstalling FIPS module configuration"
-       $(RM) $(DESTDIR)$(OPENSSLDIR)/fipsmodule.cnf
+       $(RM) "$(DESTDIR)$(OPENSSLDIR)/fipsmodule.cnf"
        @$(ECHO) "*** Uninstalling FIPS module"
-       $(RM) $(DESTDIR)$(MODULESDIR)/$(FIPSMODULENAME)
+       $(RM) "$(DESTDIR)$(MODULESDIR)/$(FIPSMODULENAME)"
 {- if ($disabled{fips}) { output_on(); } else { output_off(); } "" -}
 install_fips:
        @$(ECHO) "The 'install_fips' target requires the 'enable-fips' option"
@@ -646,75 +687,75 @@ uninstall_fips:
 
 
 install_ssldirs:
-       @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(OPENSSLDIR)/certs
-       @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(OPENSSLDIR)/private
-       @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(OPENSSLDIR)/misc
+       @$(PERL) $(SRCDIR)/util/mkdir-p.pl "$(DESTDIR)$(OPENSSLDIR)/certs"
+       @$(PERL) $(SRCDIR)/util/mkdir-p.pl "$(DESTDIR)$(OPENSSLDIR)/private"
+       @$(PERL) $(SRCDIR)/util/mkdir-p.pl "$(DESTDIR)$(OPENSSLDIR)/misc"
        @set -e; for x in dummy $(MISC_SCRIPTS); do \
                if [ "$$x" = "dummy" ]; then continue; fi; \
                x1=`echo "$$x" | cut -f1 -d:`; \
                x2=`echo "$$x" | cut -f2 -d:`; \
                fn=`basename $$x1`; \
                $(ECHO) "install $$x1 -> $(DESTDIR)$(OPENSSLDIR)/misc/$$fn"; \
-               cp $$x1 $(DESTDIR)$(OPENSSLDIR)/misc/$$fn.new; \
-               chmod 755 $(DESTDIR)$(OPENSSLDIR)/misc/$$fn.new; \
-               mv -f $(DESTDIR)$(OPENSSLDIR)/misc/$$fn.new \
-                     $(DESTDIR)$(OPENSSLDIR)/misc/$$fn; \
+               cp $$x1 "$(DESTDIR)$(OPENSSLDIR)/misc/$$fn.new"; \
+               chmod 755 "$(DESTDIR)$(OPENSSLDIR)/misc/$$fn.new"; \
+               mv -f "$(DESTDIR)$(OPENSSLDIR)/misc/$$fn.new" \
+                     "$(DESTDIR)$(OPENSSLDIR)/misc/$$fn"; \
                if [ "$$x1" != "$$x2" ]; then \
                        ln=`basename "$$x2"`; \
                        : {- output_off() unless windowsdll(); "" -}; \
                        $(ECHO) "copy $(DESTDIR)$(OPENSSLDIR)/misc/$$ln -> $(DESTDIR)$(OPENSSLDIR)/misc/$$fn"; \
-                       cp $(DESTDIR)$(OPENSSLDIR)/misc/$$fn $(DESTDIR)$(OPENSSLDIR)/misc/$$ln; \
+                       cp "$(DESTDIR)$(OPENSSLDIR)/misc/$$fn" "$(DESTDIR)$(OPENSSLDIR)/misc/$$ln"; \
                        : {- output_on() unless windowsdll();
                             output_off() if windowsdll(); "" -}; \
                        $(ECHO) "link $(DESTDIR)$(OPENSSLDIR)/misc/$$ln -> $(DESTDIR)$(OPENSSLDIR)/misc/$$fn"; \
-                       ln -sf $$fn $(DESTDIR)$(OPENSSLDIR)/misc/$$ln; \
+                       ln -sf $$fn "$(DESTDIR)$(OPENSSLDIR)/misc/$$ln"; \
                        : {- output_on() if windowsdll(); "" -}; \
                fi; \
        done
        @$(ECHO) "install $(SRCDIR)/apps/openssl.cnf -> $(DESTDIR)$(OPENSSLDIR)/openssl.cnf.dist"
-       @cp $(SRCDIR)/apps/openssl.cnf $(DESTDIR)$(OPENSSLDIR)/openssl.cnf.new
-       @chmod 644 $(DESTDIR)$(OPENSSLDIR)/openssl.cnf.new
-       @mv -f  $(DESTDIR)$(OPENSSLDIR)/openssl.cnf.new $(DESTDIR)$(OPENSSLDIR)/openssl.cnf.dist
+       @cp $(SRCDIR)/apps/openssl.cnf "$(DESTDIR)$(OPENSSLDIR)/openssl.cnf.new"
+       @chmod 644 "$(DESTDIR)$(OPENSSLDIR)/openssl.cnf.new"
+       @mv -f  "$(DESTDIR)$(OPENSSLDIR)/openssl.cnf.new" "$(DESTDIR)$(OPENSSLDIR)/openssl.cnf.dist"
        @if [ ! -f "$(DESTDIR)$(OPENSSLDIR)/openssl.cnf" ]; then \
                $(ECHO) "install $(SRCDIR)/apps/openssl.cnf -> $(DESTDIR)$(OPENSSLDIR)/openssl.cnf"; \
-               cp $(SRCDIR)/apps/openssl.cnf $(DESTDIR)$(OPENSSLDIR)/openssl.cnf; \
-               chmod 644 $(DESTDIR)$(OPENSSLDIR)/openssl.cnf; \
+               cp $(SRCDIR)/apps/openssl.cnf "$(DESTDIR)$(OPENSSLDIR)/openssl.cnf"; \
+               chmod 644 "$(DESTDIR)$(OPENSSLDIR)/openssl.cnf"; \
        fi
        @$(ECHO) "install $(SRCDIR)/apps/ct_log_list.cnf -> $(DESTDIR)$(OPENSSLDIR)/ct_log_list.cnf.dist"
-       @cp $(SRCDIR)/apps/ct_log_list.cnf $(DESTDIR)$(OPENSSLDIR)/ct_log_list.cnf.new
-       @chmod 644 $(DESTDIR)$(OPENSSLDIR)/ct_log_list.cnf.new
-       @mv -f  $(DESTDIR)$(OPENSSLDIR)/ct_log_list.cnf.new $(DESTDIR)$(OPENSSLDIR)/ct_log_list.cnf.dist
+       @cp $(SRCDIR)/apps/ct_log_list.cnf "$(DESTDIR)$(OPENSSLDIR)/ct_log_list.cnf.new"
+       @chmod 644 "$(DESTDIR)$(OPENSSLDIR)/ct_log_list.cnf.new"
+       @mv -f  "$(DESTDIR)$(OPENSSLDIR)/ct_log_list.cnf.new" "$(DESTDIR)$(OPENSSLDIR)/ct_log_list.cnf.dist"
        @if [ ! -f "$(DESTDIR)$(OPENSSLDIR)/ct_log_list.cnf" ]; then \
                $(ECHO) "install $(SRCDIR)/apps/ct_log_list.cnf -> $(DESTDIR)$(OPENSSLDIR)/ct_log_list.cnf"; \
-               cp $(SRCDIR)/apps/ct_log_list.cnf $(DESTDIR)$(OPENSSLDIR)/ct_log_list.cnf; \
-               chmod 644 $(DESTDIR)$(OPENSSLDIR)/ct_log_list.cnf; \
+               cp $(SRCDIR)/apps/ct_log_list.cnf "$(DESTDIR)$(OPENSSLDIR)/ct_log_list.cnf"; \
+               chmod 644 "$(DESTDIR)$(OPENSSLDIR)/ct_log_list.cnf"; \
        fi
 
 install_dev: install_runtime_libs
        @[ -n "$(INSTALLTOP)" ] || (echo INSTALLTOP should not be empty; exit 1)
        @$(ECHO) "*** Installing development files"
-       @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(INSTALLTOP)/include/openssl
+       @$(PERL) $(SRCDIR)/util/mkdir-p.pl "$(DESTDIR)$(INSTALLTOP)/include/openssl"
        @ : {- output_off() if $disabled{uplink}; "" -}
        @$(ECHO) "install $(SRCDIR)/ms/applink.c -> $(DESTDIR)$(INSTALLTOP)/include/openssl/applink.c"
-       @cp $(SRCDIR)/ms/applink.c $(DESTDIR)$(INSTALLTOP)/include/openssl/applink.c
-       @chmod 644 $(DESTDIR)$(INSTALLTOP)/include/openssl/applink.c
+       @cp $(SRCDIR)/ms/applink.c "$(DESTDIR)$(INSTALLTOP)/include/openssl/applink.c"
+       @chmod 644 "$(DESTDIR)$(INSTALLTOP)/include/openssl/applink.c"
        @ : {- output_on() if $disabled{uplink}; "" -}
        @set -e; for i in $(SRCDIR)/include/openssl/*.h \
                          $(BLDDIR)/include/openssl/*.h; do \
                fn=`basename $$i`; \
                $(ECHO) "install $$i -> $(DESTDIR)$(INSTALLTOP)/include/openssl/$$fn"; \
-               cp $$i $(DESTDIR)$(INSTALLTOP)/include/openssl/$$fn; \
-               chmod 644 $(DESTDIR)$(INSTALLTOP)/include/openssl/$$fn; \
+               cp $$i "$(DESTDIR)$(INSTALLTOP)/include/openssl/$$fn"; \
+               chmod 644 "$(DESTDIR)$(INSTALLTOP)/include/openssl/$$fn"; \
        done
-       @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(libdir)
+       @$(PERL) $(SRCDIR)/util/mkdir-p.pl "$(DESTDIR)$(libdir)"
        @set -e; for l in $(INSTALL_LIBS); do \
                fn=`basename $$l`; \
                $(ECHO) "install $$l -> $(DESTDIR)$(libdir)/$$fn"; \
-               cp $$l $(DESTDIR)$(libdir)/$$fn.new; \
-               $(RANLIB) $(DESTDIR)$(libdir)/$$fn.new; \
-               chmod 644 $(DESTDIR)$(libdir)/$$fn.new; \
-               mv -f $(DESTDIR)$(libdir)/$$fn.new \
-                     $(DESTDIR)$(libdir)/$$fn; \
+               cp $$l "$(DESTDIR)$(libdir)/$$fn.new"; \
+               $(RANLIB) "$(DESTDIR)$(libdir)/$$fn.new"; \
+               chmod 644 "$(DESTDIR)$(libdir)/$$fn.new"; \
+               mv -f "$(DESTDIR)$(libdir)/$$fn.new" \
+                     "$(DESTDIR)$(libdir)/$$fn"; \
        done
        @ : {- output_off() if $disabled{shared}; "" -}
        @set -e; for s in $(INSTALL_SHLIB_INFO); do \
@@ -724,21 +765,21 @@ install_dev: install_runtime_libs
                fn1=`basename "$$s1"`; \
                fn2=`basename "$$s2"`; \
                fn3=`basename "$$s3"`; \
-               : {- output_off(); output_on() unless windowsdll() or sharedaix(); "" -}; \
+               : {- output_off(); output_on() unless windowsdll() or sharedaix() or sharedaix_solib(); "" -}; \
                if [ "$$fn2" != "" ]; then \
                        $(ECHO) "link $(DESTDIR)$(libdir)/$$fn2 -> $(DESTDIR)$(libdir)/$$fn1"; \
-                       ln -sf $$fn1 $(DESTDIR)$(libdir)/$$fn2; \
+                       ln -sf $$fn1 "$(DESTDIR)$(libdir)/$$fn2"; \
                fi; \
-               : {- output_off() unless windowsdll() or sharedaix(); output_on() if windowsdll(); "" -}; \
+               : {- output_off() unless windowsdll() or sharedaix() or sharedaix_solib(); output_on() if windowsdll() or sharedaix_solib(); "" -}; \
                if [ "$$fn3" != "" ]; then \
                        $(ECHO) "install $$s3 -> $(DESTDIR)$(libdir)/$$fn3"; \
-                       cp $$s3 $(DESTDIR)$(libdir)/$$fn3.new; \
-                       chmod 755 $(DESTDIR)$(libdir)/$$fn3.new; \
-                       mv -f $(DESTDIR)$(libdir)/$$fn3.new \
-                             $(DESTDIR)$(libdir)/$$fn3; \
+                       cp $$s3 "$(DESTDIR)$(libdir)/$$fn3.new"; \
+                       chmod 755 "$(DESTDIR)$(libdir)/$$fn3.new"; \
+                       mv -f "$(DESTDIR)$(libdir)/$$fn3.new" \
+                             "$(DESTDIR)$(libdir)/$$fn3"; \
                fi; \
-               : {- output_off() if windowsdll(); output_on() if sharedaix(); "" -}; \
-               a=$(DESTDIR)$(libdir)/$$fn2; \
+               : {- output_off() if windowsdll() or sharedaix_solib(); output_on() if sharedaix(); "" -}; \
+               a="$(DESTDIR)$(libdir)/$$fn2"; \
                $(ECHO) "install $$s1 -> $$a"; \
                if [ -f $$a ]; then ( trap "rm -rf /tmp/ar.$$$$" INT 0; \
                        mkdir /tmp/ar.$$$$; ( cd /tmp/ar.$$$$; \
@@ -755,35 +796,39 @@ install_dev: install_runtime_libs
                : {- output_off() if sharedaix(); output_on(); "" -}; \
        done
        @ : {- output_on() if $disabled{shared}; "" -}
-       @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(libdir)/pkgconfig
-       @$(ECHO) "install libcrypto.pc -> $(DESTDIR)$(libdir)/pkgconfig/libcrypto.pc"
-       @cp libcrypto.pc $(DESTDIR)$(libdir)/pkgconfig
-       @chmod 644 $(DESTDIR)$(libdir)/pkgconfig/libcrypto.pc
-       @$(ECHO) "install libssl.pc -> $(DESTDIR)$(libdir)/pkgconfig/libssl.pc"
-       @cp libssl.pc $(DESTDIR)$(libdir)/pkgconfig
-       @chmod 644 $(DESTDIR)$(libdir)/pkgconfig/libssl.pc
-       @$(ECHO) "install openssl.pc -> $(DESTDIR)$(libdir)/pkgconfig/openssl.pc"
-       @cp openssl.pc $(DESTDIR)$(libdir)/pkgconfig
-       @chmod 644 $(DESTDIR)$(libdir)/pkgconfig/openssl.pc
+       @$(PERL) $(SRCDIR)/util/mkdir-p.pl "$(DESTDIR)$(PKGCONFIGDIR)"
+       @for e in $(INSTALL_EXPORTERS_PKGCONFIG); do \
+               fn=`basename $$e`; \
+               $(ECHO) "install $$e -> $(DESTDIR)$(PKGCONFIGDIR)/$$fn"; \
+               cp $$e "$(DESTDIR)$(PKGCONFIGDIR)/$$fn"; \
+               chmod 644 "$(DESTDIR)$(PKGCONFIGDIR)/$$fn"; \
+       done
+       @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(CMAKECONFIGDIR)
+       @for e in $(INSTALL_EXPORTERS_CMAKE); do \
+               fn=`basename $$e`; \
+               $(ECHO) "install $$e -> $(DESTDIR)$(CMAKECONFIGDIR)/$$fn"; \
+               cp $$e $(DESTDIR)$(CMAKECONFIGDIR)/$$fn; \
+               chmod 644 $(DESTDIR)$(CMAKECONFIGDIR)/$$fn; \
+       done
 
 uninstall_dev: uninstall_runtime_libs
        @$(ECHO) "*** Uninstalling development files"
        @ : {- output_off() if $disabled{uplink}; "" -}
        @$(ECHO) "$(RM) $(DESTDIR)$(INSTALLTOP)/include/openssl/applink.c"
-       @$(RM) $(DESTDIR)$(INSTALLTOP)/include/openssl/applink.c
+       @$(RM) "$(DESTDIR)$(INSTALLTOP)/include/openssl/applink.c"
        @ : {- output_on() if $disabled{uplink}; "" -}
        @set -e; for i in $(SRCDIR)/include/openssl/*.h \
                          $(BLDDIR)/include/openssl/*.h; do \
                fn=`basename $$i`; \
                $(ECHO) "$(RM) $(DESTDIR)$(INSTALLTOP)/include/openssl/$$fn"; \
-               $(RM) $(DESTDIR)$(INSTALLTOP)/include/openssl/$$fn; \
+               $(RM) "$(DESTDIR)$(INSTALLTOP)/include/openssl/$$fn"; \
        done
-       -$(RMDIR) $(DESTDIR)$(INSTALLTOP)/include/openssl
-       -$(RMDIR) $(DESTDIR)$(INSTALLTOP)/include
+       -$(RMDIR) "$(DESTDIR)$(INSTALLTOP)/include/openssl"
+       -$(RMDIR) "$(DESTDIR)$(INSTALLTOP)/include"
        @set -e; for l in $(INSTALL_LIBS); do \
                fn=`basename $$l`; \
                $(ECHO) "$(RM) $(DESTDIR)$(libdir)/$$fn"; \
-               $(RM) $(DESTDIR)$(libdir)/$$fn; \
+               $(RM) "$(DESTDIR)$(libdir)/$$fn"; \
        done
        @ : {- output_off() if $disabled{shared}; "" -}
        @set -e; for s in $(INSTALL_SHLIB_INFO); do \
@@ -795,39 +840,45 @@ uninstall_dev: uninstall_runtime_libs
                fn3=`basename "$$s3"`; \
                : {- output_off() if windowsdll(); "" -}; \
                $(ECHO) "$(RM) $(DESTDIR)$(libdir)/$$fn1"; \
-               $(RM) $(DESTDIR)$(libdir)/$$fn1; \
+               $(RM) "$(DESTDIR)$(libdir)/$$fn1"; \
                if [ -n "$$fn2" ]; then \
                        $(ECHO) "$(RM) $(DESTDIR)$(libdir)/$$fn2"; \
-                       $(RM) $(DESTDIR)$(libdir)/$$fn2; \
+                       $(RM) "$(DESTDIR)$(libdir)/$$fn2"; \
                fi; \
                : {- output_on() if windowsdll(); "" -}{- output_off() unless windowsdll(); "" -}; \
                if [ -n "$$fn3" ]; then \
                        $(ECHO) "$(RM) $(DESTDIR)$(libdir)/$$fn3"; \
-                       $(RM) $(DESTDIR)$(libdir)/$$fn3; \
+                       $(RM) "$(DESTDIR)$(libdir)/$$fn3"; \
                fi; \
                : {- output_on() unless windowsdll(); "" -}; \
        done
        @ : {- output_on() if $disabled{shared}; "" -}
-       $(RM) $(DESTDIR)$(libdir)/pkgconfig/libcrypto.pc
-       $(RM) $(DESTDIR)$(libdir)/pkgconfig/libssl.pc
-       $(RM) $(DESTDIR)$(libdir)/pkgconfig/openssl.pc
-       -$(RMDIR) $(DESTDIR)$(libdir)/pkgconfig
-       -$(RMDIR) $(DESTDIR)$(libdir)
+       @for e in $(INSTALL_EXPORTERS_PKGCONFIG); do \
+               fn=`basename "$$e"`; \
+               $(RM) "$(DESTDIR)$(PKGCONFIGDIR)/$$fn"; \
+       done
+       @for e in $(INSTALL_EXPORTERS_CMAKE); do \
+               fn=`basename "$$e"`; \
+               $(RM) "$(DESTDIR)$(CMAKECONFIGDIR)/$$fn"; \
+       done
+       -$(RMDIR) "$(DESTDIR)$(PKGCONFIGDIR)"
+       -$(RMDIR) "$(DESTDIR)$(CMAKECONFIGDIR)"
+       -$(RMDIR) "$(DESTDIR)$(libdir)"
 
 _install_modules_deps: install_runtime_libs build_modules
 
 install_engines: _install_modules_deps
        @[ -n "$(INSTALLTOP)" ] || (echo INSTALLTOP should not be empty; exit 1)
-       @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(ENGINESDIR)/
+       @$(PERL) $(SRCDIR)/util/mkdir-p.pl "$(DESTDIR)$(ENGINESDIR)/"
        @$(ECHO) "*** Installing engines"
        @set -e; for e in dummy $(INSTALL_ENGINES); do \
                if [ "$$e" = "dummy" ]; then continue; fi; \
                fn=`basename $$e`; \
                $(ECHO) "install $$e -> $(DESTDIR)$(ENGINESDIR)/$$fn"; \
-               cp $$e $(DESTDIR)$(ENGINESDIR)/$$fn.new; \
-               chmod 755 $(DESTDIR)$(ENGINESDIR)/$$fn.new; \
-               mv -f $(DESTDIR)$(ENGINESDIR)/$$fn.new \
-                     $(DESTDIR)$(ENGINESDIR)/$$fn; \
+               cp $$e "$(DESTDIR)$(ENGINESDIR)/$$fn.new"; \
+               chmod 755 "$(DESTDIR)$(ENGINESDIR)/$$fn.new"; \
+               mv -f "$(DESTDIR)$(ENGINESDIR)/$$fn.new" \
+                     "$(DESTDIR)$(ENGINESDIR)/$$fn"; \
        done
 
 uninstall_engines:
@@ -836,22 +887,22 @@ uninstall_engines:
                if [ "$$e" = "dummy" ]; then continue; fi; \
                fn=`basename $$e`; \
                $(ECHO) "$(RM) $(DESTDIR)$(ENGINESDIR)/$$fn"; \
-               $(RM) $(DESTDIR)$(ENGINESDIR)/$$fn; \
+               $(RM) "$(DESTDIR)$(ENGINESDIR)/$$fn"; \
        done
-       -$(RMDIR) $(DESTDIR)$(ENGINESDIR)
+       -$(RMDIR) "$(DESTDIR)$(ENGINESDIR)"
 
 install_modules: _install_modules_deps
        @[ -n "$(INSTALLTOP)" ] || (echo INSTALLTOP should not be empty; exit 1)
-       @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(MODULESDIR)/
+       @$(PERL) $(SRCDIR)/util/mkdir-p.pl "$(DESTDIR)$(MODULESDIR)/"
        @$(ECHO) "*** Installing modules"
        @set -e; for e in dummy $(INSTALL_MODULES); do \
                if [ "$$e" = "dummy" ]; then continue; fi; \
                fn=`basename $$e`; \
                $(ECHO) "install $$e -> $(DESTDIR)$(MODULESDIR)/$$fn"; \
-               cp $$e $(DESTDIR)$(MODULESDIR)/$$fn.new; \
-               chmod 755 $(DESTDIR)$(MODULESDIR)/$$fn.new; \
-               mv -f $(DESTDIR)$(MODULESDIR)/$$fn.new \
-                     $(DESTDIR)$(MODULESDIR)/$$fn; \
+               cp $$e "$(DESTDIR)$(MODULESDIR)/$$fn.new"; \
+               chmod 755 "$(DESTDIR)$(MODULESDIR)/$$fn.new"; \
+               mv -f "$(DESTDIR)$(MODULESDIR)/$$fn.new" \
+                     "$(DESTDIR)$(MODULESDIR)/$$fn"; \
        done
 
 uninstall_modules:
@@ -860,59 +911,59 @@ uninstall_modules:
                if [ "$$e" = "dummy" ]; then continue; fi; \
                fn=`basename $$e`; \
                $(ECHO) "$(RM) $(DESTDIR)$(MODULESDIR)/$$fn"; \
-               $(RM) $(DESTDIR)$(MODULESDIR)/$$fn; \
+               $(RM) "$(DESTDIR)$(MODULESDIR)/$$fn"; \
        done
-       -$(RMDIR) $(DESTDIR)$(MODULESDIR)
+       -$(RMDIR) "$(DESTDIR)$(MODULESDIR)"
 
 install_runtime: install_programs
 
 install_runtime_libs: build_libs
        @[ -n "$(INSTALLTOP)" ] || (echo INSTALLTOP should not be empty; exit 1)
        @ : {- output_off() if windowsdll(); "" -}
-       @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(libdir)
+       @$(PERL) $(SRCDIR)/util/mkdir-p.pl "$(DESTDIR)$(libdir)"
        @ : {- output_on() if windowsdll(); output_off() unless windowsdll(); "" -}
-       @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(INSTALLTOP)/bin
+       @$(PERL) $(SRCDIR)/util/mkdir-p.pl "$(DESTDIR)$(bindir)/"
        @ : {- output_on() unless windowsdll(); "" -}
        @$(ECHO) "*** Installing runtime libraries"
        @set -e; for s in dummy $(INSTALL_SHLIBS); do \
                if [ "$$s" = "dummy" ]; then continue; fi; \
                fn=`basename $$s`; \
                : {- output_off() unless windowsdll(); "" -}; \
-               $(ECHO) "install $$s -> $(DESTDIR)$(INSTALLTOP)/bin/$$fn"; \
-               cp $$s $(DESTDIR)$(INSTALLTOP)/bin/$$fn.new; \
-               chmod 755 $(DESTDIR)$(INSTALLTOP)/bin/$$fn.new; \
-               mv -f $(DESTDIR)$(INSTALLTOP)/bin/$$fn.new \
-                     $(DESTDIR)$(INSTALLTOP)/bin/$$fn; \
+               $(ECHO) "install $$s -> $(DESTDIR)$(bindir)/$$fn"; \
+               cp $$s "$(DESTDIR)$(bindir)/$$fn.new"; \
+               chmod 755 "$(DESTDIR)$(bindir)/$$fn.new"; \
+               mv -f "$(DESTDIR)$(bindir)/$$fn.new" \
+                     "$(DESTDIR)$(bindir)/$$fn"; \
                : {- output_on() unless windowsdll(); "" -}{- output_off() if windowsdll(); "" -}; \
                $(ECHO) "install $$s -> $(DESTDIR)$(libdir)/$$fn"; \
-               cp $$s $(DESTDIR)$(libdir)/$$fn.new; \
-               chmod 755 $(DESTDIR)$(libdir)/$$fn.new; \
-               mv -f $(DESTDIR)$(libdir)/$$fn.new \
-                     $(DESTDIR)$(libdir)/$$fn; \
+               cp $$s "$(DESTDIR)$(libdir)/$$fn.new"; \
+               chmod 755 "$(DESTDIR)$(libdir)/$$fn.new"; \
+               mv -f "$(DESTDIR)$(libdir)/$$fn.new" \
+                     "$(DESTDIR)$(libdir)/$$fn"; \
                : {- output_on() if windowsdll(); "" -}; \
        done
 
 install_programs: install_runtime_libs build_programs
        @[ -n "$(INSTALLTOP)" ] || (echo INSTALLTOP should not be empty; exit 1)
-       @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(INSTALLTOP)/bin
+       @$(PERL) $(SRCDIR)/util/mkdir-p.pl "$(DESTDIR)$(bindir)"
        @$(ECHO) "*** Installing runtime programs"
        @set -e; for x in dummy $(INSTALL_PROGRAMS); do \
                if [ "$$x" = "dummy" ]; then continue; fi; \
                fn=`basename $$x`; \
-               $(ECHO) "install $$x -> $(DESTDIR)$(INSTALLTOP)/bin/$$fn"; \
-               cp $$x $(DESTDIR)$(INSTALLTOP)/bin/$$fn.new; \
-               chmod 755 $(DESTDIR)$(INSTALLTOP)/bin/$$fn.new; \
-               mv -f $(DESTDIR)$(INSTALLTOP)/bin/$$fn.new \
-                     $(DESTDIR)$(INSTALLTOP)/bin/$$fn; \
+               $(ECHO) "install $$x -> $(DESTDIR)$(bindir)/$$fn"; \
+               cp $$x "$(DESTDIR)$(bindir)/$$fn.new"; \
+               chmod 755 "$(DESTDIR)$(bindir)/$$fn.new"; \
+               mv -f "$(DESTDIR)$(bindir)/$$fn.new" \
+                     "$(DESTDIR)$(bindir)/$$fn"; \
        done
        @set -e; for x in dummy $(BIN_SCRIPTS); do \
                if [ "$$x" = "dummy" ]; then continue; fi; \
                fn=`basename $$x`; \
-               $(ECHO) "install $$x -> $(DESTDIR)$(INSTALLTOP)/bin/$$fn"; \
-               cp $$x $(DESTDIR)$(INSTALLTOP)/bin/$$fn.new; \
-               chmod 755 $(DESTDIR)$(INSTALLTOP)/bin/$$fn.new; \
-               mv -f $(DESTDIR)$(INSTALLTOP)/bin/$$fn.new \
-                     $(DESTDIR)$(INSTALLTOP)/bin/$$fn; \
+               $(ECHO) "install $$x -> $(DESTDIR)$(bindir)/$$fn"; \
+               cp $$x "$(DESTDIR)$(bindir)/$$fn.new"; \
+               chmod 755 "$(DESTDIR)$(bindir)/$$fn.new"; \
+               mv -f "$(DESTDIR)$(bindir)/$$fn.new" \
+                     "$(DESTDIR)$(bindir)/$$fn"; \
        done
 
 uninstall_runtime: uninstall_programs uninstall_runtime_libs
@@ -923,17 +974,17 @@ uninstall_programs:
        do  \
                if [ "$$x" = "dummy" ]; then continue; fi; \
                fn=`basename $$x`; \
-               $(ECHO) "$(RM) $(DESTDIR)$(INSTALLTOP)/bin/$$fn"; \
-               $(RM) $(DESTDIR)$(INSTALLTOP)/bin/$$fn; \
+               $(ECHO) "$(RM) $(DESTDIR)$(bindir)/$$fn"; \
+               $(RM) "$(DESTDIR)$(bindir)/$$fn"; \
        done;
        @set -e; for x in dummy $(BIN_SCRIPTS); \
        do  \
                if [ "$$x" = "dummy" ]; then continue; fi; \
                fn=`basename $$x`; \
-               $(ECHO) "$(RM) $(DESTDIR)$(INSTALLTOP)/bin/$$fn"; \
-               $(RM) $(DESTDIR)$(INSTALLTOP)/bin/$$fn; \
+               $(ECHO) "$(RM) $(DESTDIR)$(bindir)/$$fn"; \
+               $(RM) "$(DESTDIR)$(bindir)/$$fn"; \
        done
-       -$(RMDIR) $(DESTDIR)$(INSTALLTOP)/bin
+       -$(RMDIR) "$(DESTDIR)$(bindir)"
 
 uninstall_runtime_libs:
        @$(ECHO) "*** Uninstalling runtime libraries"
@@ -941,50 +992,50 @@ uninstall_runtime_libs:
        @set -e; for s in dummy $(INSTALL_SHLIBS); do \
                if [ "$$s" = "dummy" ]; then continue; fi; \
                fn=`basename $$s`; \
-               $(ECHO) "$(RM) $(DESTDIR)$(INSTALLTOP)/bin/$$fn"; \
-               $(RM) $(DESTDIR)$(INSTALLTOP)/bin/$$fn; \
+               $(ECHO) "$(RM) $(DESTDIR)$(bindir)/$$fn"; \
+               $(RM) "$(DESTDIR)$(bindir)/$$fn"; \
        done
        @ : {- output_on() unless windowsdll(); "" -}
 
 
 install_man_docs: build_man_docs
        @[ -n "$(INSTALLTOP)" ] || (echo INSTALLTOP should not be empty; exit 1)
-       @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(MANDIR)/man1
-       @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(MANDIR)/man3
-       @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(MANDIR)/man5
-       @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(MANDIR)/man7
+       @$(PERL) $(SRCDIR)/util/mkdir-p.pl "$(DESTDIR)$(MANDIR)/man1"
+       @$(PERL) $(SRCDIR)/util/mkdir-p.pl "$(DESTDIR)$(MANDIR)/man3"
+       @$(PERL) $(SRCDIR)/util/mkdir-p.pl "$(DESTDIR)$(MANDIR)/man5"
+       @$(PERL) $(SRCDIR)/util/mkdir-p.pl "$(DESTDIR)$(MANDIR)/man7"
        @$(ECHO) "*** Installing manpages"
        @set -e; for x in dummy $(MANDOCS1); do \
                if [ "$$x" = "dummy" ]; then continue; fi; \
                fn=`basename $$x`; \
                $(ECHO) "install $$x -> $(DESTDIR)$(MANDIR)/man1/$${fn}$(MANSUFFIX)"; \
-               cp $$x $(DESTDIR)$(MANDIR)/man1/$${fn}$(MANSUFFIX); \
-               chmod 644 $(DESTDIR)$(MANDIR)/man1/$${fn}$(MANSUFFIX); \
-               $(PERL) $(SRCDIR)/util/write-man-symlinks install $(SRCDIR)/doc/man1 $(BLDDIR)/doc/man1 $${fn}$(MANSUFFIX) $(DESTDIR)$(MANDIR)/man1; \
+               cp $$x "$(DESTDIR)$(MANDIR)/man1/$${fn}$(MANSUFFIX)"; \
+               chmod 644 "$(DESTDIR)$(MANDIR)/man1/$${fn}$(MANSUFFIX)"; \
+               $(PERL) $(SRCDIR)/util/write-man-symlinks install $(SRCDIR)/doc/man1 $(BLDDIR)/doc/man1 $${fn}$(MANSUFFIX) "$(DESTDIR)$(MANDIR)/man1"; \
        done
        @set -e; for x in dummy $(MANDOCS3); do \
                if [ "$$x" = "dummy" ]; then continue; fi; \
                fn=`basename $$x`; \
                $(ECHO) "install $$x -> $(DESTDIR)$(MANDIR)/man3/$${fn}$(MANSUFFIX)"; \
-               cp $$x $(DESTDIR)$(MANDIR)/man3/$${fn}$(MANSUFFIX); \
-               chmod 644 $(DESTDIR)$(MANDIR)/man3/$${fn}$(MANSUFFIX); \
-               $(PERL) $(SRCDIR)/util/write-man-symlinks install $(SRCDIR)/doc/man3 $(BLDDIR)/doc/man3 $${fn}$(MANSUFFIX) $(DESTDIR)$(MANDIR)/man3; \
+               cp $$x "$(DESTDIR)$(MANDIR)/man3/$${fn}$(MANSUFFIX)"; \
+               chmod 644 "$(DESTDIR)$(MANDIR)/man3/$${fn}$(MANSUFFIX)"; \
+               $(PERL) $(SRCDIR)/util/write-man-symlinks install $(SRCDIR)/doc/man3 $(BLDDIR)/doc/man3 $${fn}$(MANSUFFIX) "$(DESTDIR)$(MANDIR)/man3"; \
        done
        @set -e; for x in dummy $(MANDOCS5); do \
                if [ "$$x" = "dummy" ]; then continue; fi; \
                fn=`basename $$x`; \
                $(ECHO) "install $$x -> $(DESTDIR)$(MANDIR)/man5/$${fn}$(MANSUFFIX)"; \
-               cp $$x $(DESTDIR)$(MANDIR)/man5/$${fn}$(MANSUFFIX); \
-               chmod 644 $(DESTDIR)$(MANDIR)/man5/$${fn}$(MANSUFFIX); \
-               $(PERL) $(SRCDIR)/util/write-man-symlinks install $(SRCDIR)/doc/man5 $(BLDDIR)/doc/man5 $${fn}$(MANSUFFIX) $(DESTDIR)$(MANDIR)/man5; \
+               cp $$x "$(DESTDIR)$(MANDIR)/man5/$${fn}$(MANSUFFIX)"; \
+               chmod 644 "$(DESTDIR)$(MANDIR)/man5/$${fn}$(MANSUFFIX)"; \
+               $(PERL) $(SRCDIR)/util/write-man-symlinks install $(SRCDIR)/doc/man5 $(BLDDIR)/doc/man5 $${fn}$(MANSUFFIX) "$(DESTDIR)$(MANDIR)/man5"; \
        done
        @set -e; for x in dummy $(MANDOCS7); do \
                if [ "$$x" = "dummy" ]; then continue; fi; \
                fn=`basename $$x`; \
                $(ECHO) "install $$x -> $(DESTDIR)$(MANDIR)/man7/$${fn}$(MANSUFFIX)"; \
-               cp $$x $(DESTDIR)$(MANDIR)/man7/$${fn}$(MANSUFFIX); \
-               chmod 644 $(DESTDIR)$(MANDIR)/man7/$${fn}$(MANSUFFIX); \
-               $(PERL) $(SRCDIR)/util/write-man-symlinks install $(SRCDIR)/doc/man7 $(BLDDIR)/doc/man7 $${fn}$(MANSUFFIX) $(DESTDIR)$(MANDIR)/man7; \
+               cp $$x "$(DESTDIR)$(MANDIR)/man7/$${fn}$(MANSUFFIX)"; \
+               chmod 644 "$(DESTDIR)$(MANDIR)/man7/$${fn}$(MANSUFFIX)"; \
+               $(PERL) $(SRCDIR)/util/write-man-symlinks install $(SRCDIR)/doc/man7 $(BLDDIR)/doc/man7 $${fn}$(MANSUFFIX) "$(DESTDIR)$(MANDIR)/man7"; \
        done
 
 uninstall_man_docs: build_man_docs
@@ -993,65 +1044,65 @@ uninstall_man_docs: build_man_docs
                if [ "$$x" = "dummy" ]; then continue; fi; \
                fn=`basename $$x`; \
                $(ECHO) "$(RM) $(DESTDIR)$(MANDIR)/man1/$${fn}$(MANSUFFIX)"; \
-               $(RM) $(DESTDIR)$(MANDIR)/man1/$${fn}$(MANSUFFIX); \
-               $(PERL) $(SRCDIR)/util/write-man-symlinks uninstall $(SRCDIR)/doc/man1 $(BLDDIR)/doc/man1 $${fn}$(MANSUFFIX) $(DESTDIR)$(MANDIR)/man1; \
+               $(RM) "$(DESTDIR)$(MANDIR)/man1/$${fn}$(MANSUFFIX)"; \
+               $(PERL) $(SRCDIR)/util/write-man-symlinks uninstall $(SRCDIR)/doc/man1 $(BLDDIR)/doc/man1 $${fn}$(MANSUFFIX) "$(DESTDIR)$(MANDIR)/man1"; \
        done
        @set -e; for x in dummy $(MANDOCS3); do \
                if [ "$$x" = "dummy" ]; then continue; fi; \
                fn=`basename $$x`; \
                $(ECHO) "$(RM) $(DESTDIR)$(MANDIR)/man3/$${fn}$(MANSUFFIX)"; \
-               $(RM) $(DESTDIR)$(MANDIR)/man3/$${fn}$(MANSUFFIX); \
-               $(PERL) $(SRCDIR)/util/write-man-symlinks uninstall $(SRCDIR)/doc/man3 $(BLDDIR)/doc/man3 $${fn}$(MANSUFFIX) $(DESTDIR)$(MANDIR)/man3; \
+               $(RM) "$(DESTDIR)$(MANDIR)/man3/$${fn}$(MANSUFFIX)"; \
+               $(PERL) $(SRCDIR)/util/write-man-symlinks uninstall $(SRCDIR)/doc/man3 $(BLDDIR)/doc/man3 $${fn}$(MANSUFFIX) "$(DESTDIR)$(MANDIR)/man3"; \
        done
        @set -e; for x in dummy $(MANDOCS5); do \
                if [ "$$x" = "dummy" ]; then continue; fi; \
                fn=`basename $$x`; \
                $(ECHO) "$(RM) $(DESTDIR)$(MANDIR)/man5/$${fn}$(MANSUFFIX)"; \
-               $(RM) $(DESTDIR)$(MANDIR)/man5/$${fn}$(MANSUFFIX); \
-               $(PERL) $(SRCDIR)/util/write-man-symlinks uninstall $(SRCDIR)/doc/man5 $(BLDDIR)/doc/man5 $${fn}$(MANSUFFIX) $(DESTDIR)$(MANDIR)/man5; \
+               $(RM) "$(DESTDIR)$(MANDIR)/man5/$${fn}$(MANSUFFIX)"; \
+               $(PERL) $(SRCDIR)/util/write-man-symlinks uninstall $(SRCDIR)/doc/man5 $(BLDDIR)/doc/man5 $${fn}$(MANSUFFIX) "$(DESTDIR)$(MANDIR)/man5"; \
        done
        @set -e; for x in dummy $(MANDOCS7); do \
                if [ "$$x" = "dummy" ]; then continue; fi; \
                fn=`basename $$x`; \
                $(ECHO) "$(RM) $(DESTDIR)$(MANDIR)/man7/$${fn}$(MANSUFFIX)"; \
-               $(RM) $(DESTDIR)$(MANDIR)/man7/$${fn}$(MANSUFFIX); \
-               $(PERL) $(SRCDIR)/util/write-man-symlinks uninstall $(SRCDIR)/doc/man7 $(BLDDIR)/doc/man7 $${fn}$(MANSUFFIX) $(DESTDIR)$(MANDIR)/man7; \
+               $(RM) "$(DESTDIR)$(MANDIR)/man7/$${fn}$(MANSUFFIX)"; \
+               $(PERL) $(SRCDIR)/util/write-man-symlinks uninstall $(SRCDIR)/doc/man7 $(BLDDIR)/doc/man7 $${fn}$(MANSUFFIX) "$(DESTDIR)$(MANDIR)/man7"; \
        done
 
 install_html_docs: install_image_docs build_html_docs
        @[ -n "$(INSTALLTOP)" ] || (echo INSTALLTOP should not be empty; exit 1)
-       @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(HTMLDIR)/man1
-       @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(HTMLDIR)/man3
-       @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(HTMLDIR)/man5
-       @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(HTMLDIR)/man7
+       @$(PERL) $(SRCDIR)/util/mkdir-p.pl "$(DESTDIR)$(HTMLDIR)/man1"
+       @$(PERL) $(SRCDIR)/util/mkdir-p.pl "$(DESTDIR)$(HTMLDIR)/man3"
+       @$(PERL) $(SRCDIR)/util/mkdir-p.pl "$(DESTDIR)$(HTMLDIR)/man5"
+       @$(PERL) $(SRCDIR)/util/mkdir-p.pl "$(DESTDIR)$(HTMLDIR)/man7"
        @$(ECHO) "*** Installing HTML manpages"
        @set -e; for x in dummy $(HTMLDOCS1); do \
                if [ "$$x" = "dummy" ]; then continue; fi; \
                fn=`basename $$x`; \
                $(ECHO) "install $$x -> $(DESTDIR)$(HTMLDIR)/man1/$$fn"; \
-               cp $$x $(DESTDIR)$(HTMLDIR)/man1/$$fn; \
-               chmod 644 $(DESTDIR)$(HTMLDIR)/man1/$$fn; \
+               cp $$x "$(DESTDIR)$(HTMLDIR)/man1/$$fn"; \
+               chmod 644 "$(DESTDIR)$(HTMLDIR)/man1/$$fn"; \
        done
        @set -e; for x in dummy $(HTMLDOCS3); do \
                if [ "$$x" = "dummy" ]; then continue; fi; \
                fn=`basename $$x`; \
                $(ECHO) "install $$x -> $(DESTDIR)$(HTMLDIR)/man3/$$fn"; \
-               cp $$x $(DESTDIR)$(HTMLDIR)/man3/$$fn; \
-               chmod 644 $(DESTDIR)$(HTMLDIR)/man3/$$fn; \
+               cp $$x "$(DESTDIR)$(HTMLDIR)/man3/$$fn"; \
+               chmod 644 "$(DESTDIR)$(HTMLDIR)/man3/$$fn"; \
        done
        @set -e; for x in dummy $(HTMLDOCS5); do \
                if [ "$$x" = "dummy" ]; then continue; fi; \
                fn=`basename $$x`; \
                $(ECHO) "install $$x -> $(DESTDIR)$(HTMLDIR)/man5/$$fn"; \
-               cp $$x $(DESTDIR)$(HTMLDIR)/man5/$$fn; \
-               chmod 644 $(DESTDIR)$(HTMLDIR)/man5/$$fn; \
+               cp $$x "$(DESTDIR)$(HTMLDIR)/man5/$$fn"; \
+               chmod 644 "$(DESTDIR)$(HTMLDIR)/man5/$$fn"; \
        done
        @set -e; for x in dummy $(HTMLDOCS7); do \
                if [ "$$x" = "dummy" ]; then continue; fi; \
                fn=`basename $$x`; \
                $(ECHO) "install $$x -> $(DESTDIR)$(HTMLDIR)/man7/$$fn"; \
-               cp $$x $(DESTDIR)$(HTMLDIR)/man7/$$fn; \
-               chmod 644 $(DESTDIR)$(HTMLDIR)/man7/$$fn; \
+               cp $$x "$(DESTDIR)$(HTMLDIR)/man7/$$fn"; \
+               chmod 644 "$(DESTDIR)$(HTMLDIR)/man7/$$fn"; \
        done
 
 uninstall_html_docs: uninstall_image_docs
@@ -1060,35 +1111,35 @@ uninstall_html_docs: uninstall_image_docs
                if [ "$$x" = "dummy" ]; then continue; fi; \
                fn=`basename $$x`; \
                $(ECHO) "$(RM) $(DESTDIR)$(HTMLDIR)/man1/$$fn"; \
-               $(RM) $(DESTDIR)$(HTMLDIR)/man1/$$fn; \
+               $(RM) "$(DESTDIR)$(HTMLDIR)/man1/$$fn"; \
        done
        @set -e; for x in dummy $(HTMLDOCS3); do \
                if [ "$$x" = "dummy" ]; then continue; fi; \
                fn=`basename $$x`; \
                $(ECHO) "$(RM) $(DESTDIR)$(HTMLDIR)/man3/$$fn"; \
-               $(RM) $(DESTDIR)$(HTMLDIR)/man3/$$fn; \
+               $(RM) "$(DESTDIR)$(HTMLDIR)/man3/$$fn"; \
        done
        @set -e; for x in dummy $(HTMLDOCS5); do \
                if [ "$$x" = "dummy" ]; then continue; fi; \
                fn=`basename $$x`; \
                $(ECHO) "$(RM) $(DESTDIR)$(HTMLDIR)/man5/$$fn"; \
-               $(RM) $(DESTDIR)$(HTMLDIR)/man5/$$fn; \
+               $(RM) "$(DESTDIR)$(HTMLDIR)/man5/$$fn"; \
        done
        @set -e; for x in dummy $(HTMLDOCS7); do \
                if [ "$$x" = "dummy" ]; then continue; fi; \
                fn=`basename $$x`; \
                $(ECHO) "$(RM) $(DESTDIR)$(HTMLDIR)/man7/$$fn"; \
-               $(RM) $(DESTDIR)$(HTMLDIR)/man7/$$fn; \
+               $(RM) "$(DESTDIR)$(HTMLDIR)/man7/$$fn"; \
        done
 
 install_image_docs:
-       @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(HTMLDIR)/man7/img
+       @$(PERL) $(SRCDIR)/util/mkdir-p.pl "$(DESTDIR)$(HTMLDIR)/man7/img"
        @set -e; for x in dummy $(IMAGEDOCS7); do \
                if [ "$$x" = "dummy" ]; then continue; fi; \
                fn=`basename $$x`; \
                $(ECHO) "install $$x -> $(DESTDIR)$(HTMLDIR)/man7/img/$$fn"; \
-               cp $(SRCDIR)/$$x $(DESTDIR)$(HTMLDIR)/man7/img/$$fn; \
-               chmod 644 $(DESTDIR)$(HTMLDIR)/man7/img/$$fn; \
+               cp $(SRCDIR)/$$x "$(DESTDIR)$(HTMLDIR)/man7/img/$$fn"; \
+               chmod 644 "$(DESTDIR)$(HTMLDIR)/man7/img/$$fn"; \
        done
 
 uninstall_image_docs:
@@ -1096,14 +1147,15 @@ uninstall_image_docs:
                if [ "$$x" = "dummy" ]; then continue; fi; \
                fn=`basename $$x`; \
                $(ECHO) "$(RM) $(DESTDIR)$(HTMLDIR)/man7/img/$$fn"; \
-               $(RM) $(DESTDIR)$(HTMLDIR)/man7/img/$$fn; \
+               $(RM) "$(DESTDIR)$(HTMLDIR)/man7/img/$$fn"; \
        done
 
 # Developer targets (note: these are only available on Unix) #########
+##@ Code maintenance
 
 # It's important that generate_buildinfo comes after ordinals, as ordinals
 # is sensitive to build.info changes.
-update: generate errors ordinals generate_buildinfo
+update: generate errors ordinals generate_buildinfo ## Update errors, ordinals and build info
 
 .PHONY: generate generate_apps generate_crypto_bn generate_crypto_objects \
           generate_crypto_conf generate_crypto_asn1 generate_fuzz_oids
@@ -1114,7 +1166,7 @@ generate: generate_apps generate_crypto_bn generate_crypto_objects \
 generate_buildinfo: generate_doc_buildinfo
 
 .PHONY: doc-nits md-nits
-doc-nits: build_generated_pods
+doc-nits: build_generated_pods ## Evaluate OpenSSL documentation
        $(PERL) $(SRCDIR)/util/find-doc-nits -c -n -l -e
 
 # This uses "mdl", the markdownlint application, which is written in ruby.
@@ -1123,15 +1175,23 @@ doc-nits: build_generated_pods
 # Another option is at https://snapcraft.io/install/mdl/debian
 # Finally, there's a Node.js version, which we haven't tried, that
 # can be found at https://github.com/DavidAnson/markdownlint
-md-nits:
-       mdl -s util/markdownlint.rb .
+md-nits: ## Evaluate markdown files via "mdl"
+       mdl -s $(SRCDIR)/util/markdownlint.rb .
 
 # Test coverage is a good idea for the future
 #coverage: $(PROGRAMS) $(TESTPROGRAMS)
 #      ...
 
-lint:
-       lint -DLINT $(INCLUDES) $(SRCS)
+.PHONY: lint
+lint: ## Evaluate C code via "splint"
+       @( cd $(SRCDIR); \
+           echo splint -DLINT -posixlib -preproc -D__gnuc_va_list=void \
+          -I. -Iinclude -Iapps/include $(CRYPTOHEADERS) $(SSLHEADERS) $(SRCS) )
+
+.PHONY: check-format
+check-format: ## Evaluate C code according to OpenSSL coding standards
+       ( cd $(SRCDIR); $(PERL) util/check-format.pl \
+                       $(SRCS) \$(CRYPTOHEADERS) $(SSLHEADERS) )
 
 generate_apps:
        ( cd $(SRCDIR); $(PERL) VMS/VMSify-conf.pl \
@@ -1195,12 +1255,12 @@ providers/fips.module.sources.new: configdata.pm
          cd sources-tmp \
          && $$srcdir/Configure --banner=Configured enable-fips -O0 \
          && ./configdata.pm --query 'get_sources("providers/fips")' > sources1 \
-         && $(MAKE) -sj 4 build_generated providers/fips.so \
+         && "$(MAKE)" -sj 4 build_generated providers/fips.so \
          && find . -name '*.d' | xargs cat > dep1 \
-          && $(MAKE) distclean \
+          && "$(MAKE)" distclean \
          && $$srcdir/Configure --banner=Configured enable-fips no-asm -O0 \
          && ./configdata.pm --query 'get_sources("providers/fips")' > sources2 \
-         && $(MAKE) -sj 4 build_generated providers/fips.so \
+         && "$(MAKE)" -sj 4 build_generated providers/fips.so \
          && find . -name '*.d' | xargs cat > dep2 \
          && cat sources1 sources2 \
             | grep -v ' : \\$$' | grep -v util/providers.num \
@@ -1230,10 +1290,11 @@ providers/fips.module.sources.new: configdata.pm
                   crypto/ec/asm/*.pl \
                   crypto/modes/asm/*.pl \
                   crypto/sha/asm/*.pl \
-                  crypto/x86_64cpuid.pl; do \
+                  crypto/*cpuid.pl crypto/*cpuid.S \
+                  crypto/*cap.c; do \
            echo "$$x"; \
          done \
-       ) | sort | uniq > providers/fips.module.sources.new
+       ) | grep -v sm2p256 | sort | uniq > providers/fips.module.sources.new
        rm -rf sources-tmp
 
 # Set to -force to force a rebuild
@@ -1271,7 +1332,8 @@ errors:
            include/internal/asn1.h
            include/internal/sslconf.h );
    my @cryptoskipheaders = ( @sslheaders_tmpl,
-       qw( include/openssl/conf_api.h
+       qw( include/openssl/asn1_mac.h
+           include/openssl/conf_api.h
            include/openssl/ebcdic.h
            include/openssl/opensslconf.h
            include/openssl/symhacks.h ) );
@@ -1331,25 +1393,23 @@ renumber: build_generated
                 --renumber \
                 $(SSLHEADERS)
 
-$(SRCDIR)/util/libcrypto.num: $(CRYPTOHEADERS) $(SRCDIR)/include/openssl/symhacks.h
+.PHONY: ordinals
+ordinals: build_generated
        $(PERL) $(SRCDIR)/util/mknum.pl --version $(VERSION_NUMBER) --no-warnings \
                 --ordinals $(SRCDIR)/util/libcrypto.num \
                 --symhacks $(SRCDIR)/include/openssl/symhacks.h \
                 $(CRYPTOHEADERS)
-$(SRCDIR)/util/libssl.num: $(SSLHEADERS) $(SRCDIR)/include/openssl/symhacks.h
        $(PERL) $(SRCDIR)/util/mknum.pl --version $(VERSION_NUMBER) --no-warnings \
                 --ordinals $(SRCDIR)/util/libssl.num \
                 --symhacks $(SRCDIR)/include/openssl/symhacks.h \
                 $(SSLHEADERS)
-.PHONY: ordinals
-ordinals: build_generated $(SRCDIR)/util/libcrypto.num $(SRCDIR)/util/libssl.num
 
 test_ordinals:
-       $(MAKE) run_tests TESTS=test_ordinals
+       "$(MAKE)" run_tests TESTS=test_ordinals
 
 tags TAGS: FORCE
        rm -f TAGS tags
-       -ctags -R .
+       -( cd $(SRCDIR); util/ctags.sh )
        -etags `find . -name '*.[ch]' -o -name '*.pm'`
 
 providers/fips.checksum.new: providers/fips.module.sources.new
@@ -1403,59 +1463,6 @@ FORCE:
 
 # Building targets ###################################################
 
-libcrypto.pc libssl.pc openssl.pc: Makefile $(LIBS) {- join(" ",map { platform->sharedlib_simple($_) // platform->sharedlib_import($_) // platform->sharedlib($_) // () } @{$unified_info{libraries}}) -}
-
-libcrypto.pc:
-       @ ( echo 'prefix=$(INSTALLTOP)'; \
-           echo 'exec_prefix=$${prefix}'; \
-           if [ -n "$(LIBDIR)" ]; then \
-               echo 'libdir=$${exec_prefix}/$(LIBDIR)'; \
-           else \
-               echo 'libdir=$(libdir)'; \
-           fi; \
-           echo 'includedir=$${prefix}/include'; \
-           echo 'enginesdir=$${libdir}/engines-{- $sover_dirname -}'; \
-           echo 'modulesdir=$${libdir}/ossl-modules'; \
-           echo ''; \
-           echo 'Name: OpenSSL-libcrypto'; \
-           echo 'Description: OpenSSL cryptography library'; \
-           echo 'Version: '$(VERSION); \
-           echo 'Libs: -L$${libdir} -lcrypto'; \
-           echo 'Libs.private: $(LIB_EX_LIBS)'; \
-           echo 'Cflags: -I$${includedir}' ) > libcrypto.pc
-
-libssl.pc:
-       @ ( echo 'prefix=$(INSTALLTOP)'; \
-           echo 'exec_prefix=$${prefix}'; \
-           if [ -n "$(LIBDIR)" ]; then \
-               echo 'libdir=$${exec_prefix}/$(LIBDIR)'; \
-           else \
-               echo 'libdir=$(libdir)'; \
-           fi; \
-           echo 'includedir=$${prefix}/include'; \
-           echo ''; \
-           echo 'Name: OpenSSL-libssl'; \
-           echo 'Description: Secure Sockets Layer and cryptography libraries'; \
-           echo 'Version: '$(VERSION); \
-           echo 'Requires.private: libcrypto'; \
-           echo 'Libs: -L$${libdir} -lssl'; \
-           echo 'Cflags: -I$${includedir}' ) > libssl.pc
-
-openssl.pc:
-       @ ( echo 'prefix=$(INSTALLTOP)'; \
-           echo 'exec_prefix=$${prefix}'; \
-           if [ -n "$(LIBDIR)" ]; then \
-               echo 'libdir=$${exec_prefix}/$(LIBDIR)'; \
-           else \
-               echo 'libdir=$(libdir)'; \
-           fi; \
-           echo 'includedir=$${prefix}/include'; \
-           echo ''; \
-           echo 'Name: OpenSSL'; \
-           echo 'Description: Secure Sockets Layer and cryptography libraries and tools'; \
-           echo 'Version: '$(VERSION); \
-           echo 'Requires: libssl libcrypto' ) > openssl.pc
-
 Makefile: configdata.pm \
           {- join(" \\\n" . ' ' x 10,
                   fill_lines(" ", $COLUMNS - 10,
@@ -1567,7 +1574,8 @@ EOF
 $target: $gen0 $deps \$(SRCDIR)/util/mkdef.pl
        \$(PERL) \$(SRCDIR)/util/mkdef.pl$ord_ver --type $args{intent} --ordinals $gen0  --name $ord_name --OS $mkdef_os > $target
 EOF
-      } elsif (platform->isasm($args{src})) {
+      } elsif (platform->isasm($args{src})
+               || platform->iscppasm($args{src})) {
           #
           # Assembler generator
           #
@@ -1608,12 +1616,44 @@ EOF
           my $dofile = abs2rel(rel2abs(catfile($config{sourcedir},
                                                "util", "dofile.pl")),
                                rel2abs($config{builddir}));
-          my @perlmodules = ( 'configdata.pm',
-                              grep { $_ =~ m|\.pm$| } @{$args{deps}} );
-          my %perlmoduleincs = map { '"-I'.dirname($_).'"' => 1 } @perlmodules;
-          $deps = join(' ', $deps, compute_platform_depends(@perlmodules));
-          @perlmodules = map { "-M".basename($_, '.pm') } @perlmodules;
-          my $perlmodules = join(' ', '', sort keys %perlmoduleincs, @perlmodules);
+          my @perlmodules = ();
+          my %perlmoduleincs = ();
+          my %perlmoduledeps = ();
+          foreach my $x (('configdata.pm', @{$args{deps}})) {
+              # Compute (i)nclusion directory, (m)odule name and (d)ependency
+              my $i, $m, $d;
+              if ($x =~ /\|/) {
+                  $i = $`;
+                  $d = $';
+
+                  # Massage the module part to become a real perl module spec
+                  $m = $d;
+                  $m =~ s|\.pm$||;
+                  # Directory specs are :: in perl package names
+                  $m =~ s|/|::|g;
+
+                  # Full file name of the dependency
+                  $d = catfile($i, $d) if $i;
+              } elsif ($x =~ /\.pm$/) {
+                  $i = dirname($x);
+                  $m = basename($x, '.pm');
+                  $d = $x;
+              } else {
+                  # All other dependencies are simply collected
+                  $d = $x;
+              }
+              push @perlmodules, '"-M'.$m.'"' if $m;
+              $perlmoduledeps{$d} = 1;
+              $perlmoduleincs{'"-I'.$i.'"'} = 1 if $i;
+          }
+
+          # Because of the special treatment of dependencies, we need to
+          # recompute $deps completely
+          my $deps
+              = join(" ", compute_platform_depends(@{$args{generator_deps}},
+                                                   sort keys %perlmoduledeps));
+          my $perlmodules = join(' ', '', ( sort keys %perlmoduleincs ), @perlmodules);
+
           return <<"EOF";
 $args{src}: $gen0 $deps
        \$(PERL)$perlmodules "$dofile" "-o$target{build_file}" $gen0$gen_args > \$@
@@ -1755,6 +1795,8 @@ EOF
       # libraries for DLLs are a thing.  On platforms that have this mechanism,
       # $import has the name of this import library.  On platforms that don't
       # have this mechanism, $import will be |undef|.
+      # It's also used on AIX in solib mode, which creates import libraries
+      # for the shared libraries.
       my $import = platform->sharedlib_import($args{lib});
       # $simple is for platforms where full shared library names include the
       # shared library version, and there's a simpler name that doesn't include
@@ -1815,9 +1857,18 @@ EOF
           }
       }
       if (defined $import) {
+          if (sharedaix_solib()) {
+              $recipe .= <<"EOF";
+$import: $full $defs[0]
+       rm -f $import && \\
+       echo \\#!$full > $import && \\
+        cat $defs[0] >>$import
+EOF
+          } else {
       $recipe .= <<"EOF";
 $import: $full
 EOF
+          }
       }
       $recipe .= <<"EOF";
 $full: $fulldeps