Commit f1c2ab35 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Fix to make install works in all configurations.

parent 7506ac8d
Loading
Loading
Loading
Loading
+4 −2
Original line number Diff line number Diff line
@@ -1372,18 +1372,20 @@ while (<IN>)
		{
		s/^FIPSCANLIB=.*/FIPSCANLIB=libfips/;
		s/^SHARED_FIPS=.*/SHARED_FIPS=libfips\$(SHLIB_EXT)/;
		s/^SHLIBDIRS=.*/SHLIBDIRS= crypto ssl fips/;
		}
	else
		{
		s/^FIPSCANLIB=.*/FIPSCANLIB=/;
		s/^FIPSCANLIB=.*/FIPSCANLIB=libcrypto/;
		s/^SHARED_FIPS=.*/SHARED_FIPS=/;
		s/^SHLIBDIRS=.*/SHLIBDIRS= crypto ssl/;
		}
	s/^FIPSCANISTERINTERNAL=.*/FIPSCANISTERINTERNAL=$fipscanisterinternal/;
	s/^BASEADDR=.*/BASEADDR=$baseaddr/;
	s/^ZLIB_INCLUDE=.*/ZLIB_INCLUDE=$withargs{"zlib-include"}/;
	s/^SHLIB_TARGET=.*/SHLIB_TARGET=$shared_target/;
	s/^SHLIB_MARK=.*/SHLIB_MARK=$shared_mark/;
	s/^SHARED_LIBS=.*/SHARED_LIBS=\$(SHARED_CRYPTO) \$(SHARED_SSL)/ if (!$no_shared);
	s/^SHARED_LIBS=.*/SHARED_LIBS=\$(SHARED_CRYPTO) \$(SHARED_SSL) \$(SHARED_FIPS)/ if (!$no_shared);
	if ($shared_extension ne "" && $shared_extension =~ /^\.s([ol])\.[^\.]*$/)
		{
		my $sotmp = $1;