[lmi-commits] [lmi] master eb35fec 1/2: Work around a 'wine' regression

[Greg Chicares]

branch: master
commit eb35fec587d0369d86c3a51ece097993aa1e2968
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>

    Work around a 'wine' regression
---
 GNUmakefile      | 2 +-
 msw_generic.make | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/GNUmakefile b/GNUmakefile
index afc9163..28b07a9 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -345,7 +345,7 @@ check_concinnity: source_clean custom_tools
        @$(ECHO) "  Problems detected by xmllint:"
        @for z in $(xml_files); \
          do \
-           $(PERFORM) $(XMLLINT) --encode ASCII $$z \
+           $(XMLLINT) --encode ASCII $$z \
            | $(TR) --delete '\r' \
            | $(DIFF) \
              --ignore-blank-lines \
diff --git a/msw_generic.make b/msw_generic.make
index 9f6bf2c..156f67e 100644
--- a/msw_generic.make
+++ b/msw_generic.make
@@ -109,9 +109,11 @@ WGET    := wget
 # Programs for which FHS doesn't specify a location.
 
 # Instead of requiring installation of the build system's own libxml2:
-#   XMLLINT := xmllint
+    XMLLINT := xmllint
 # use the one that lmi builds:
-XMLLINT := /opt/lmi/local/bin/xmllint
+#   XMLLINT := $(PERFORM) /opt/lmi/local/bin/xmllint
+# but don't do that until 'wine' is fixed--see:
+#   https://lists.nongnu.org/archive/html/lmi/2019-01/msg00034.html
 
 
################################################################################