Fixes to build system to cleanly handle fipsdso

diff --git a/fips-1.0/Makefile b/fips-1.0/Makefile
index c6812e64556d7c8abcf14656a31c6c5c56b9d6df..da156514da978537689fd675c8fdb4409812f1ac 100644 (file)
--- a/fips-1.0/Makefile
+++ b/fips-1.0/Makefile
@@ -137,7 +137,7 @@ lib:        $(FIPSCANLOC) delexobj
        @touch lib
 
 shared:        fips_premain_dso$(EXE_EXT)
-       if [ -n "$(SHARED_LIBS)" ]; then \
+       if [ -n "$(SHARED_LIBS)" -a "$(FIPSCANLIB)" != "libfips" ]; then \
                (cd ..; $(MAKE) FIPSLD_CC=$(CC) FIPSLD=fips-1.0/fipsld $(SHARED_LIB)); \
        fi
 

diff --git a/fips-1.0/fipsld b/fips-1.0/fipsld
index 3db6fc3fb704fde22a00a2c202807e5a0622c64e..d5fd785fab5bd897dcc3e063672b48231736f926 100755 (executable)
--- a/fips-1.0/fipsld
+++ b/fips-1.0/fipsld
@@ -64,7 +64,7 @@ case "${TARGET}" in
 esac
 
 case "${TARGET}" in
-*${FIPCANLIB}*|*.dll)  # must be linking a shared lib...
+*${FIPSCANLIB}*|*.dll) # must be linking a shared lib...
        # Shared lib creation can be taking place in the source
        # directory only!!!
        FINGERTYPE="${THERE}/fips-1.0/sha/fips_standalone_sha1"