From: Jonny Grant <jg@jguk.org>
Date: Sat, 12 Jul 2014 09:53:59 +0000 (+0300)
Subject: Fix defalt_makefiles[] for MS-Windows.
X-Git-Tag: 4.1~32
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cab353d1dd4dc98d322db4f698f3a20c2e6ffd5e;p=thirdparty%2Fmake.git

Fix defalt_makefiles[] for MS-Windows.

* read.c (read_all_makefiles) [WINDOWS32]: Remove the redundant
"makefile" and add "makefile.mak".

Copyright-paperwork-exempt: yes
---

diff --git a/read.c b/read.c
index fe33ab29..6ac66f4f 100644
--- a/read.c
+++ b/read.c
@@ -246,7 +246,11 @@ read_all_makefiles (const char **makefiles)
 #ifdef _AMIGA
         { "GNUmakefile", "Makefile", "SMakefile", 0 };
 #else /* !Amiga && !VMS */
+#ifdef WINDOWS32
+        { "GNUmakefile", "Makefile", "makefile.mak", 0 };
+#else /* !Amiga && !VMS && !WINDOWS32 */
         { "GNUmakefile", "makefile", "Makefile", 0 };
+#endif /* !Amiga && !VMS && !WINDOWS32 */
 #endif /* AMIGA */
 #endif /* VMS */
       const char **p = default_makefiles;