* README.git: [SV 56895] Provide more info about "maintainer mode".

* src/read.c (get_next_mword) [HAVE_DOS_PATHS]: Don't fall through to
parsing variable references if we find a drivespec in a word!

diff --git a/README.git b/README.git
index a78726d76145bd9ae99ab1591fb7829c04832239..6589a3f1036e3a74e32986256db35c5a31652212 100644 (file)
--- a/README.git
+++ b/README.git
@@ -119,14 +119,24 @@ That is, you can just run:
 
   $ ./configure
   $ make check
-  $ make install
 
-to build and install GNU make.
+to build and test GNU make.
 
-NOTE! This method builds GNU make in "maintainer mode".  In this mode it will
-      be slower, possibly MUCH slower: there are various sanity checks
-      enabled.  If you want to build from Git with "maintainer mode" disabled,
-      add "MAKE_MAINTAINER_MODE=" to your make command line.
+NOTE! This method builds GNU make in "maintainer mode".  Make programs built
+      in this mode it will be slower, possibly MUCH slower: there are various
+      sanity checks enabled.  Further this mode assumes a modern GCC, GNU
+      libc, and well-formed system headers and enables a high level of
+      warnings AND enables -Werror to turn warnings into failures.
+
+      If you want to build from Git with "maintainer mode" disabled, add
+      "MAKE_MAINTAINER_MODE=" to the make command line.  If you want to turn
+      off the extra warning flags, add "MAKE_CFLAGS=" to the make command
+      line.
+
+      For example:
+        $ ./configure
+        $ make check MAKE_MAINTAINER_MODE= MAKE_CFLAGS=
+        $ make install
 
 
 Building From Git for Windows
@@ -165,9 +175,10 @@ Even better, you should run this:
 Which will build both .gz and .bz2 package files, then unpack them into
 a temporary location, try to build them, and repack them, verifying that
 everything works, you get the same results, _and_ no extraneous files
-are left over after the "distclean" rule--whew!!  Now, _that_ is why
-converting to Automake is worth the trouble!  A big "huzzah!" to Tom
-T. and the AutoToolers!
+are left over after the "distclean" rule.
+
+This package can be unpacked and built to give a "normal" (non-maintainer
+mode) result.
 
 
 Steps to Release

diff --git a/src/read.c b/src/read.c
index 53fee223fae3f8f4857d91fab3db0afb6f1edb04..5df9c2a3bc11999f9fc8bf942126877d685673b8 100644 (file)
--- a/src/read.c
+++ b/src/read.c
@@ -2829,9 +2829,9 @@ get_next_mword (char *buffer, char **startp, size_t *length)
           /* A word CAN include a colon in its drive spec.  The drive
              spec is allowed either at the beginning of a word, or as part
              of the archive member name, like in "libfoo.a(d:/foo/bar.o)".  */
-          if (!(p - beg >= 2
-                && (*p == '/' || *p == '\\') && isalpha ((unsigned char)p[-2])
-                && (p - beg == 2 || p[-3] == '(')))
+          if ((p - beg == 2 || (p - beg > 2 && p[-3] == '('))
+              && isalpha ((unsigned char)p[-2]))
+            break;
 #endif
           goto done_word;