Use || instead of && so build doesn't fail.
authorDr. Stephen Henson <steve@openssl.org>
Thu, 26 May 2011 22:10:28 +0000 (22:10 +0000)
committerDr. Stephen Henson <steve@openssl.org>
Thu, 26 May 2011 22:10:28 +0000 (22:10 +0000)
Makefile.org
crypto/Makefile

index 56abf480f9b9515fd70bac97d729e5552a4e8308..1e2e466ef56e4a0f8397817d55ebec5497562168 100644 (file)
@@ -286,7 +286,7 @@ build_testapps:
        @dir=crypto; target=testapps; $(BUILD_ONE_CMD)
 
 fips_premain_dso$(EXE_EXT): libcrypto.a
-       [ -n "$(FIPSCANLIB)" ] && $(CC) $(CFLAGS) \
+       [ -z "$(FIPSCANLIB)" ] || $(CC) $(CFLAGS) \
                -DFINGERPRINT_PREMAIN_DSO_LOAD -o $@  \
                $(FIPSLIBDIR)fips_premain.c $(FIPSLIBDIR)fipscanister.o \
                libcrypto.a $(EX_LIBS)
index 3e5f7ae88211552e84a695e1afd099b85f40ed4e..544e2360053ddca484be503b937924ac5c09f779 100644 (file)
@@ -102,7 +102,7 @@ lib:        $(LIB)
        @touch lib
 $(LIB):        $(LIBOBJ)
        $(AR) $(LIB) $(LIBOBJ)
-       [ -n "$(FIPSLIBDIR)" ] && $(AR) $(LIB) $(FIPSLIBDIR)fipscanister.o
+       [ -z "$(FIPSLIBDIR)" ] || $(AR) $(LIB) $(FIPSLIBDIR)fipscanister.o
        $(RANLIB) $(LIB) || echo Never mind.
 
 shared: buildinf.h lib subdirs