No need for trailing slash any more.

[openssl.git] / Makefile.org

diff --git a/Makefile.org b/Makefile.org
index 1e2e466ef56e4a0f8397817d55ebec5497562168..b66c6462e5976e70fd424c47e0c8a7d82b664109 100644 (file)
--- a/Makefile.org
+++ b/Makefile.org
@@ -145,7 +145,7 @@ SDIRS=  \
        bn ec rsa dsa ecdsa dh ecdh dso engine \
        buffer bio stack lhash rand err \
        evp asn1 pem x509 x509v3 conf txt_db pkcs7 pkcs12 comp ocsp ui krb5 \
-       cms pqueue ts jpake srp store
+       cms pqueue ts jpake srp store cmac
 # keep in mind that the above list is adjusted by ./Configure
 # according to no-xxx arguments...
 
@@ -286,7 +286,7 @@ build_testapps:
        @dir=crypto; target=testapps; $(BUILD_ONE_CMD)
 
 fips_premain_dso$(EXE_EXT): libcrypto.a
-       [ -z "$(FIPSCANLIB)" ] || $(CC) $(CFLAGS) \
+       [ -z "$(FIPSCANLIB)" ] || $(CC) $(CFLAG) -Iinclude \
                -DFINGERPRINT_PREMAIN_DSO_LOAD -o $@  \
                $(FIPSLIBDIR)fips_premain.c $(FIPSLIBDIR)fipscanister.o \
                libcrypto.a $(EX_LIBS)
@@ -295,7 +295,7 @@ libcrypto$(SHLIB_EXT): libcrypto.a fips_premain_dso$(EXE_EXT)
        @if [ "$(SHLIB_TARGET)" != "" ]; then \
                if [ "$(FIPSCANLIB)" = "libcrypto" ]; then \
                        FIPSLD_LIBCRYPTO=libcrypto.a ; \
-                       FIPSLD_CC="$(CC)"; CC=$(FIPSDIR)bin/fipsld; \
+                       FIPSLD_CC="$(CC)"; CC=$(FIPSDIR)/bin/fipsld; \
                        export CC FIPSLD_CC FIPSLD_LIBCRYPTO; \
                fi; \
                $(MAKE) -e SHLIBDIRS=crypto build-shared; \