Make install option work in fipdso (maybe!).
authorDr. Stephen Henson <steve@openssl.org>
Thu, 25 Jan 2007 22:05:52 +0000 (22:05 +0000)
committerDr. Stephen Henson <steve@openssl.org>
Thu, 25 Jan 2007 22:05:52 +0000 (22:05 +0000)
Makefile.org
fips-1.0/Makefile

index 114ea5b3fb5bf5a6349f8fa9eccf55f84d9c4ebb..53e39b2db623f2c2fb76ea04b4a9b8baa549da11 100644 (file)
@@ -198,7 +198,7 @@ BASEADDR=
 SHLIB_MARK=
 
 DIRS=   crypto fips-1.0 ssl $(SHLIB_MARK) apps test tools
-SHLIBDIRS= crypto ssl
+SHLIBDIRS= crypto ssl fips
 
 # dirs in crypto to build
 SDIRS=  objects \
index f6fd7410d3a98701edd691ba14c2c7eda31d3596..041536d7e8db97bc69945cc243d1cd68e086bafc 100644 (file)
@@ -133,6 +133,10 @@ links:
 
 lib:   $(FIPSCANLOC) delexobj
        $(AR) ../$(FIPSCANLIB).a $(FIPSCANLOC)
+       if [ "$(FIPSCANLIB)" == "libfips" ]; then \
+               $(AR) $(LIB) $(FIPSCANLOC) ; \
+               $(RANLIB) $(LIB) || echo Never Mind. ; \
+       fi
        $(RANLIB) ../$(FIPSCANLIB).a || echo Never mind.
        @touch lib