diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2011-05-26 22:10:28 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2011-05-26 22:10:28 +0000 |
| commit | ae6cb5483ef687ff52bdf59fca0d13651a84759a (patch) | |
| tree | 17b6baf1227738a9b160714bda0a58f5bc030874 | |
| parent | a168ec1d27afc234791de0e4ee6a784bad411b22 (diff) | |
Use || instead of && so build doesn't fail.
| -rw-r--r-- | Makefile.org | 2 | ||||
| -rw-r--r-- | crypto/Makefile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.org b/Makefile.org index 56abf480f9..1e2e466ef5 100644 --- a/Makefile.org +++ b/Makefile.org @@ -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) diff --git a/crypto/Makefile b/crypto/Makefile index 3e5f7ae882..544e236005 100644 --- a/crypto/Makefile +++ b/crypto/Makefile @@ -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 |