Always use buildinf.h, which now includes the mk1mfinf.h data.

Using different files caused problems because the dependencies
in the Makefiles produced by mk1mf.pl were for the standard case,
i.e. mentioned buildinf.h and not mk1mfinf.h.

1 files changed, 7 insertions, 6 deletions

diff --git a/Configure b/Configure
index fbac48e399..30927aeed7 100755
--- a/Configure
+++ b/Configure
@@ -708,13 +708,14 @@ print "BF_PTR2 used\n" if $bf_ptr == 2;
 if($IsWindows) {
 	open (OUT,">crypto/buildinf.h") || die "Can't open buildinf.h";
 	printf OUT <<EOF;
-/* auto-generated by Configure for crypto/cversion.c */
-/* (Unix builds: auto-generated by crypto/Makefile.ssl) */
-/* mk1mf builds use mk1mfinf.h instead, so this file is probably never needed */
-#define CFLAGS "$cc $cflags"
-#define PLATFORM "$target"
+#ifndef MK1MF_BUILD
+  /* auto-generated by Configure for crypto/cversion.c:
+   * for Unix builds, crypto/Makefile.ssl generates functional definitions;
+   * Windows builds (and other mk1mf builds) compile cversion.c with
+   * -DMK1MF_BUILD and use definitions added to this file by util/mk1mf.pl. */
+  #error "Windows builds (PLATFORM=$target) use mk1mf.pl-created Makefiles"
+#endif
 EOF
-	printf OUT "#define DATE \"%s\"\n", scalar gmtime();
 	close(OUT);
 
 	system "perl crypto/objects/obj_dat.pl <crypto/objects/objects.h >crypto/objects/obj_dat.h";