diff options
| -rw-r--r-- | Configurations/unix-Makefile.tmpl | 9 | ||||
| -rw-r--r-- | Configurations/windows-makefile.tmpl | 6 | ||||
| -rwxr-xr-x | util/wrap.pl | 3 |
3 files changed, 16 insertions, 2 deletions
diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl index ef4fd5f077..1ff418c4c6 100644 --- a/Configurations/unix-Makefile.tmpl +++ b/Configurations/unix-Makefile.tmpl @@ -1215,7 +1215,8 @@ tar: # Helper targets ##################################################### -link-utils: $(BLDDIR)/util/opensslwrap.sh $(BLDDIR)/util/wrap.pl +link-utils: $(BLDDIR)/util/opensslwrap.sh $(BLDDIR)/util/wrap.pl \ + $(BLDDIR)/apps/openssl.cnf $(BLDDIR)/util/opensslwrap.sh $(BLDDIR)/util/wrap.pl: configdata.pm @if [ "$(SRCDIR)" != "$(BLDDIR)" ]; then \ @@ -1223,6 +1224,12 @@ $(BLDDIR)/util/opensslwrap.sh $(BLDDIR)/util/wrap.pl: configdata.pm ln -sf "../$(SRCDIR)/util/`basename "$@"`" "$(BLDDIR)/util"; \ fi +$(BLDDIR)/apps/openssl.cnf: configdata.pm + @if [ "$(SRCDIR)" != "$(BLDDIR)" ]; then \ + mkdir -p "$(BLDDIR)/apps"; \ + ln -sf "../$(SRCDIR)/apps/`basename "$@"`" "$(BLDDIR)/apps"; \ + fi + FORCE: # Building targets ################################################### diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl index 846c500bef..050d618a23 100644 --- a/Configurations/windows-makefile.tmpl +++ b/Configurations/windows-makefile.tmpl @@ -594,12 +594,16 @@ uninstall_html_docs: # Helper targets ##################################################### -copy-utils: $(BLDDIR)\util\wrap.pl +copy-utils: $(BLDDIR)\util\wrap.pl $(BLDDIR)\apps\openssl.cnf $(BLDDIR)\util\wrap.pl: configdata.pm @if NOT EXIST "$(BLDDIR)\util" mkdir "$(BLDDIR)\util" @if NOT "$(SRCDIR)"=="$(BLDDIR)" copy "$(SRCDIR)\util\$(@F)" "$(BLDDIR)\util" +$(BLDDIR)\apps\openssl.cnf: configdata.pm + @if NOT EXIST "$(BLDDIR)\apps" mkdir "$(BLDDIR)\apps" + @if NOT "$(SRCDIR)"=="$(BLDDIR)" copy "$(SRCDIR)\apps\$(@F)" "$(BLDDIR)\apps" + # Building targets ################################################### configdata.pm: "$(SRCDIR)\Configure" {- join(" ", map { '"'.$_.'"' } @{$config{build_file_templates}}, @{$config{build_infos}}, @{$config{conf_files}}) -} diff --git a/util/wrap.pl b/util/wrap.pl index fd24c42c8b..69be06d302 100755 --- a/util/wrap.pl +++ b/util/wrap.pl @@ -9,12 +9,15 @@ use File::Spec::Functions; my $there = canonpath(catdir(dirname($0), updir())); my $std_engines = catdir($there, 'engines'); my $std_providers = catdir($there, 'providers'); +my $std_openssl_conf = catdir($there, 'apps/openssl.cnf'); my $unix_shlib_wrap = catfile($there, 'util/shlib_wrap.sh'); $ENV{OPENSSL_ENGINES} = $std_engines if ($ENV{OPENSSL_ENGINES} // '') eq '' && -d $std_engines; $ENV{OPENSSL_MODULES} = $std_providers if ($ENV{OPENSSL_MODULES} // '') eq '' && -d $std_providers; +$ENV{OPENSSL_CONF} = $std_openssl_conf + if ($ENV{OPENSSL_CONF} // '') eq '' && -f $std_openssl_conf; my $use_system = 0; my @cmd; |