Fix to make install works in all configurations.
authorDr. Stephen Henson <steve@openssl.org>
Thu, 25 Jan 2007 22:39:08 +0000 (22:39 +0000)
committerDr. Stephen Henson <steve@openssl.org>
Thu, 25 Jan 2007 22:39:08 +0000 (22:39 +0000)
Configure

index 24046a1e5d6522aeee992ab4f3480bc7ec7900b0..73daa2f032c16093d169d758801163a46d549b9f 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -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;