diff options
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/.cvsignore | 1 | ||||
| -rw-r--r-- | crypto/Makefile.ssl | 13 | ||||
| -rw-r--r-- | crypto/cversion.c | 6 |
3 files changed, 8 insertions, 12 deletions
diff --git a/crypto/.cvsignore b/crypto/.cvsignore index b8d2cb1da2..6b86a0a8dc 100644 --- a/crypto/.cvsignore +++ b/crypto/.cvsignore @@ -1,5 +1,4 @@ lib buildinf.h -mk1mfinf.h opensslconf.h Makefile.save diff --git a/crypto/Makefile.ssl b/crypto/Makefile.ssl index c27a69d5e1..930dd02a9b 100644 --- a/crypto/Makefile.ssl +++ b/crypto/Makefile.ssl @@ -50,11 +50,12 @@ top: all: buildinf.h lib subdirs buildinf.h: ../Makefile.ssl - ( echo "/* auto-generated by crypto/Makefile.ssl for crypto/cversion.c */"; \ - echo "/* (mk1mf builds use mk1mfinf.h instead) */"; \ - echo "#define CFLAGS \"$(CC) $(CFLAG)\""; \ - echo "#define PLATFORM \"$(PLATFORM)\""; \ - echo "#define DATE \"`date`\"" ) >buildinf.h + ( echo "#ifndef MK1MF_BUILD"; \ + echo " /* auto-generated by crypto/Makefile.ssl for crypto/cversion.c */"; \ + echo " #define CFLAGS \"$(CC) $(CFLAG)\""; \ + echo " #define PLATFORM \"$(PLATFORM)\""; \ + echo " #define DATE \"`date`\""; \ + echo "#endif" ) >buildinf.h subdirs: @for i in $(SDIRS) ;\ @@ -129,7 +130,7 @@ depend: done; clean: - rm -f buildinf.h mk1mfinf.h *.o */*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff + rm -f buildinf.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 428def3081..297f8843f5 100644 --- a/crypto/cversion.c +++ b/crypto/cversion.c @@ -61,11 +61,7 @@ #include "cryptlib.h" #include <openssl/crypto.h> -#ifdef MK1MF_BUILD -# include "mk1mfinf.h" -#else -# include "buildinf.h" -#endif +#include "buildinf.h" const char *SSLeay_version(int t) { |