[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [lmi] master d6b7693 3/8: Move wget flags into $(WGETFLAGS
From: |
Greg Chicares |
Subject: |
[lmi-commits] [lmi] master d6b7693 3/8: Move wget flags into $(WGETFLAGS) |
Date: |
Thu, 18 May 2017 22:45:44 -0400 (EDT) |
branch: master
commit d6b7693f6a31a99e47505a9d4893550bcb07918c
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>
Move wget flags into $(WGETFLAGS)
---
install_wx.make | 4 +++-
install_wxpdfdoc.make | 3 ++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/install_wx.make b/install_wx.make
index 038c781..bf2a920 100644
--- a/install_wx.make
+++ b/install_wx.make
@@ -204,9 +204,11 @@ WGETFLAGS :=
# date. See:
# http://lists.nongnu.org/archive/html/lmi/2015-08/msg00012.html
+%.zip: WGETFLAGS += '--output-document=$@'
+
.PHONY: %.zip
%.zip:
- cd $(cache_dir) && [ -e $@ ] || $(WGET) $(WGETFLAGS)
--output-document=$@ $(address@hidden)
+ cd $(cache_dir) && [ -e $@ ] || $(WGET) $(WGETFLAGS) $(address@hidden)
cd $(cache_dir) && $(ECHO) "$(address@hidden) *$@" | $(MD5SUM) --check
-$(UNZIP) $(UNZIPFLAGS) $(cache_dir)/$@ -d $(wx_dir)
diff --git a/install_wxpdfdoc.make b/install_wxpdfdoc.make
index 6f2c8d1..904e9a0 100644
--- a/install_wxpdfdoc.make
+++ b/install_wxpdfdoc.make
@@ -97,10 +97,11 @@ initial_setup:
UNZIPFLAGS := -q
WGETFLAGS :=
+%.zip: WGETFLAGS += '--output-document=$@'
.PHONY: %.zip
%.zip: initial_setup
- cd $(cache_dir) && [ -e $@ ] || $(WGET) $(WGETFLAGS)
--output-document=$@ $(address@hidden)
+ cd $(cache_dir) && [ -e $@ ] || $(WGET) $(WGETFLAGS) $(address@hidden)
cd $(cache_dir) && $(ECHO) "$(address@hidden) *$@" | $(MD5SUM) --check
-$(UNZIP) $(UNZIPFLAGS) $(cache_dir)/$@ -d $(wxpdfdoc_dir)
- [lmi-commits] [lmi] master updated (dc58a57 -> df34159), Greg Chicares, 2017/05/18
- [lmi-commits] [lmi] master 65e02fd 2/8: Make wx build directory at a more appropriate time, Greg Chicares, 2017/05/18
- [lmi-commits] [lmi] master d93fdce 6/8: Halt on wx patch failure, Greg Chicares, 2017/05/18
- [lmi-commits] [lmi] master d6b7693 3/8: Move wget flags into $(WGETFLAGS),
Greg Chicares <=
- [lmi-commits] [lmi] master 296dad1 5/8: Base wx patches on source directory, not its parent, Greg Chicares, 2017/05/18
- [lmi-commits] [lmi] master df34159 8/8: Remove an unnecessary makefile variable, Greg Chicares, 2017/05/18
- [lmi-commits] [lmi] master 8717778 1/8: Update lists of handy commands, Greg Chicares, 2017/05/18
- [lmi-commits] [lmi] master 53e1802 4/8: Use a gainlier name for source directory, Greg Chicares, 2017/05/18
- [lmi-commits] [lmi] master bca897c 7/8: Add new wx patch; remove old ones (VZ), Greg Chicares, 2017/05/18