Commit 7725c76c authored by Bernd Edlinger's avatar Bernd Edlinger
Browse files

Fix minor windows build issues 



[extended tests]

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6663)
parent 03998dcc

Configurations/windows-checker.pm

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ use Config; 
# we expect for the platform

use File::Spec::Functions qw(:DEFAULT rel2abs);



if (rel2abs('.') !~ m|\\|) {

if (!$ENV{CONFIGURE_INSIST} && rel2abs('.') !~ m|\\|) {

    die <<EOF;



******************************************************************************

Configurations/windows-makefile.tmpl

+11 −11
Original line number Diff line number Diff line
@@ -88,20 +88,20 @@ GENERATED={- join(" ", 
                    grep { /\.o$/ } keys %{$unified_info{sources}} ),

                  ( grep { /\.h$/ } keys %{$unified_info{generate}} )) -}



INSTALL_LIBS={- join(" ", map { $_.$libext } @{$unified_info{install}->{libraries}}) -}

INSTALL_SHLIBS={- join(" ", map { shlib($_) } @{$unified_info{install}->{libraries}}) -}

INSTALL_SHLIBPDBS={- join(" ", map { local $shlibext = ".pdb"; shlib($_) } @{$unified_info{install}->{libraries}}) -}

INSTALL_ENGINES={- join(" ", map { dso($_) } @{$unified_info{install}->{engines}}) -}

INSTALL_ENGINEPDBS={- join(" ", map { local $dsoext = ".pdb"; dso($_) } @{$unified_info{install}->{engines}}) -}

INSTALL_PROGRAMS={- join(" ", map { $_.$exeext } grep { !m|^test\\| } @{$unified_info{install}->{programs}}) -}

INSTALL_PROGRAMPDBS={- join(" ", map { $_.".pdb" } grep { !m|^test\\| } @{$unified_info{install}->{programs}}) -}

INSTALL_LIBS={- join(" ", map { quotify1($_.$libext) } @{$unified_info{install}->{libraries}}) -}

INSTALL_SHLIBS={- join(" ", map { quotify1(shlib($_)) } @{$unified_info{install}->{libraries}}) -}

INSTALL_SHLIBPDBS={- join(" ", map { local $shlibext = ".pdb"; quotify1(shlib($_)) } @{$unified_info{install}->{libraries}}) -}

INSTALL_ENGINES={- join(" ", map { quotify1(dso($_)) } @{$unified_info{install}->{engines}}) -}

INSTALL_ENGINEPDBS={- join(" ", map { local $dsoext = ".pdb"; quotify1(dso($_)) } @{$unified_info{install}->{engines}}) -}

INSTALL_PROGRAMS={- join(" ", map { quotify1($_.$exeext) } grep { !m|^test\\| } @{$unified_info{install}->{programs}}) -}

INSTALL_PROGRAMPDBS={- join(" ", map { quotify1($_.".pdb") } grep { !m|^test\\| } @{$unified_info{install}->{programs}}) -}

{- output_off() if $disabled{apps}; "" -}

BIN_SCRIPTS=$(BLDDIR)\tools\c_rehash.pl

MISC_SCRIPTS=$(BLDDIR)\apps\CA.pl $(BLDDIR)\apps\tsget.pl

BIN_SCRIPTS="$(BLDDIR)\tools\c_rehash.pl"

MISC_SCRIPTS="$(BLDDIR)\apps\CA.pl" "$(BLDDIR)\apps\tsget.pl"

{- output_on() if $disabled{apps}; "" -}



APPS_OPENSSL={- use File::Spec::Functions;

                catfile("apps","openssl") -}

                "\"".catfile("apps","openssl")."\"" -}



# Do not edit these manually. Use Configure with --prefix or --openssldir

# to change this!  Short explanation in the top comment in Configure
@@ -295,7 +295,7 @@ install_dev: 
	@"$(PERL)" "$(SRCDIR)\util\copy.pl" "-exclude_re=/__DECC_" \

				       "$(SRCDIR)\include\openssl\*.h" \

				       "$(INSTALLTOP)\include\openssl"

	@"$(PERL)" "$(SRCDIR)\util\copy.pl" $(BLDDIR)\include\openssl\*.h \

	@"$(PERL)" "$(SRCDIR)\util\copy.pl" "$(BLDDIR)\include\openssl\*.h" \

				       "$(INSTALLTOP)\include\openssl"

	@"$(PERL)" "$(SRCDIR)\util\mkdir-p.pl" "$(INSTALLTOP)\$(LIBDIR)"

	@"$(PERL)" "$(SRCDIR)\util\copy.pl" $(INSTALL_LIBS) \