[lmi-commits] [lmi] master 1972ada 1/2: Fix defect introduced 20160717T2345Z: hostname improperly static

[Greg Chicares]

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

    Fix defect introduced 20160717T2345Z: hostname improperly static
    
    Hostname is target specific, so it must be recursively expanded. It was
    changed from immediately to recursively expanded on 20160715T1315Z, and
    that change was not wrong in its context, but became wrong when zlib
    was added.
---
 install_libxml2_libxslt.make |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/install_libxml2_libxslt.make b/install_libxml2_libxslt.make
index 9662875..0f36ae7 100644
--- a/install_libxml2_libxslt.make
+++ b/install_libxml2_libxslt.make
@@ -147,12 +147,15 @@ initial_setup:
        $(MKDIR) --parents $(cache_dir)
        $(MKDIR) --parents $(xml_dir)
 
-WGETFLAGS := \
+# $(WGETFLAGS) and $(wget_whence) must be recursively expanded because
+# $(host) and $(host_path) have target-specific values.
+
+WGETFLAGS = \
   --cut-dirs=$(words $(subst /, ,$(host_path))) \
   --force-directories \
   --no-host-directories \
 
-wget_whence := $(host)/$(host_path)
+wget_whence = $(host)/$(host_path)
 
 TARFLAGS := --keep-old-files
 %.tar.bz2: TARFLAGS += --bzip2