diff options
author | Bodo Möller <bodo@openssl.org> | 1999-07-27 09:10:36 +0000 |
---|---|---|
committer | Bodo Möller <bodo@openssl.org> | 1999-07-27 09:10:36 +0000 |
commit | 2e0fc875992dc0b4a0d1372871e27c9ffa31ec3e (patch) | |
tree | c74532634aa762ca073d8a0e8ccc52b37ea02a42 /crypto | |
parent | 488c06579ea0f1dea01704ba9669f32da3510886 (diff) | |
download | openssl-2e0fc875992dc0b4a0d1372871e27c9ffa31ec3e.tar.gz |
Use correct CFLAG definition for makefile.one builds.
Diffstat (limited to 'crypto')
-rw-r--r-- | crypto/.cvsignore | 1 | ||||
-rw-r--r-- | crypto/Makefile.ssl | 4 | ||||
-rw-r--r-- | crypto/cversion.c | 7 |
3 files changed, 9 insertions, 3 deletions
diff --git a/crypto/.cvsignore b/crypto/.cvsignore index 6b86a0a8dc..b8d2cb1da2 100644 --- a/crypto/.cvsignore +++ b/crypto/.cvsignore @@ -1,4 +1,5 @@ lib buildinf.h +mk1mfinf.h opensslconf.h Makefile.save diff --git a/crypto/Makefile.ssl b/crypto/Makefile.ssl index d5e48d5c41..c27a69d5e1 100644 --- a/crypto/Makefile.ssl +++ b/crypto/Makefile.ssl @@ -51,7 +51,7 @@ all: buildinf.h lib subdirs buildinf.h: ../Makefile.ssl ( echo "/* auto-generated by crypto/Makefile.ssl for crypto/cversion.c */"; \ - echo "/* (Windows builds: auto-generated by Configure) */"; \ + echo "/* (mk1mf builds use mk1mfinf.h instead) */"; \ echo "#define CFLAGS \"$(CC) $(CFLAG)\""; \ echo "#define PLATFORM \"$(PLATFORM)\""; \ echo "#define DATE \"`date`\"" ) >buildinf.h @@ -129,7 +129,7 @@ depend: done; clean: - rm -f buildinf.h *.o */*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff + rm -f buildinf.h mk1mfinf.h *.o */*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff @for i in $(SDIRS) ;\ do \ (cd $$i; echo "making clean in crypto/$$i..."; \ diff --git a/crypto/cversion.c b/crypto/cversion.c index 72af476fbe..428def3081 100644 --- a/crypto/cversion.c +++ b/crypto/cversion.c @@ -60,7 +60,12 @@ #include <string.h> #include "cryptlib.h" #include <openssl/crypto.h> -#include "buildinf.h" + +#ifdef MK1MF_BUILD +# include "mk1mfinf.h" +#else +# include "buildinf.h" +#endif const char *SSLeay_version(int t) { |