[lmi-commits] [lmi] master 3ce05e8b 5/7: Regularize definition of $(XMLLINT) as much as possible

[Greg Chicares]

branch: master
commit 3ce05e8bd2bfcbf4e9c988c757996fc98abc2afa
Author: Gregory W. Chicares <gchicares@sbcglobal.net>
Commit: Gregory W. Chicares <gchicares@sbcglobal.net>

    Regularize definition of $(XMLLINT) as much as possible
---
 msw_cygwin.make  | 6 +++---
 msw_generic.make | 8 ++++----
 msw_wsl.make     | 4 +++-
 posix_fhs.make   | 7 ++++++-
 4 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/msw_cygwin.make b/msw_cygwin.make
index 8c0c6262..45b4d03d 100644
--- a/msw_cygwin.make
+++ b/msw_cygwin.make
@@ -84,10 +84,10 @@ compiler_runtime_files := \
 
 # Programs for which FHS doesn't specify a location.
 
-# Instead of requiring installation of the build system's own libxml2:
+# The 'xmllint' lmi builds matches the libxml2 version lmi uses:
+    XMLLINT := $(localbindir)/xmllint
+# while the build system's own 'xmllint', if installed, may differ:
 #   XMLLINT := xmllint
-# use the one that lmi builds:
-XMLLINT := $(localbindir)/xmllint
 
 
################################################################################
 
diff --git a/msw_generic.make b/msw_generic.make
index 2267eceb..fce23f0f 100644
--- a/msw_generic.make
+++ b/msw_generic.make
@@ -64,11 +64,11 @@ compiler_runtime_files := \
 
 # Programs for which FHS doesn't specify a location.
 
-# Instead of requiring installation of the build system's own libxml2:
-    XMLLINT := xmllint
-# use the one that lmi builds:
+# The 'xmllint' lmi builds matches the libxml2 version lmi uses:
 #   XMLLINT := $(PERFORM) $(localbindir)/xmllint$(EXEEXT)
-# but don't do that until 'wine' is fixed--see:
+# while the build system's own 'xmllint', if installed, may differ:
+    XMLLINT := xmllint
+# Don't use the one lmi builds until 'wine' is fixed--see:
 #   https://lists.nongnu.org/archive/html/lmi/2019-01/msg00034.html
 
 
################################################################################
diff --git a/msw_wsl.make b/msw_wsl.make
index 128e4d7f..34f88d95 100644
--- a/msw_wsl.make
+++ b/msw_wsl.make
@@ -64,8 +64,10 @@ compiler_runtime_files := \
 
 # Programs for which FHS doesn't specify a location.
 
-# Instead of requiring installation of the build system's own libxml2:
+# The 'xmllint' lmi builds matches the libxml2 version lmi uses:
     XMLLINT := $(localbindir)/xmllint$(EXEEXT)
+# while the build system's own 'xmllint', if installed, may differ:
+#   XMLLINT := xmllint
 
 
################################################################################
 
diff --git a/posix_fhs.make b/posix_fhs.make
index 91621aeb..f8d984e6 100644
--- a/posix_fhs.make
+++ b/posix_fhs.make
@@ -36,4 +36,9 @@ LD      := g++
 # that msw resources aren't used on this platform.
 RC      :=
 
-XMLLINT := xmllint
+# Programs for which FHS doesn't specify a location.
+
+# The 'xmllint' lmi builds matches the libxml2 version lmi uses:
+#   XMLLINT := $(localbindir)/xmllint
+# while the build system's own 'xmllint', if installed, may differ:
+    XMLLINT := xmllint