From: Eric Andersen <andersen@codepoet.org>
Date: Wed, 20 Nov 2002 23:16:10 +0000 (-0000)
Subject: Make use of wget consistant by using a WGET variable
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8a2597eaba5ca76c94ba3657eb3b476b4cf3a538;p=buildroot.git

Make use of wget consistant by using a WGET variable
---

diff --git a/Makefile b/Makefile
index 8aa1d32a56..4f470f3395 100644
--- a/Makefile
+++ b/Makefile
@@ -39,7 +39,7 @@ USE_UCLIBC_TOOLCHAIN:=true
 # Enable this to use the uClibc daily snapshot instead of a released
 # version.  Daily snapshots may contain new features and bugfixes. Or
 # they may not even compile at all, depending on what Erik is doing...
-USE_UCLIBC_SNAPSHOT:=false
+USE_UCLIBC_SNAPSHOT:=true
 
 # Enable this to use the busybox daily snapshot instead of a released
 # version.  Daily snapshots may contain new features and bugfixes. Or
@@ -49,6 +49,9 @@ USE_BUSYBOX_SNAPSHOT:=false
 # Enable large file (files > 2 GB) support
 BUILD_WITH_LARGEFILE:=false
 
+# Command used to download source code
+WGET:=wget --passive-ftp
+
 #############################################################
 #
 # The list of stuff to build for the target filesystem
diff --git a/make/bash.mk b/make/bash.mk
index de9d61b5fb..dc11c36090 100644
--- a/make/bash.mk
+++ b/make/bash.mk
@@ -11,7 +11,7 @@ BASH_BINARY:=bash
 BASH_TARGET_BINARY:=bin/bash
 
 $(DL_DIR)/$(BASH_SOURCE):
-	 wget -P $(DL_DIR) $(BASH_SITE)/$(BASH_SOURCE)
+	 $(WGET) -P $(DL_DIR) $(BASH_SITE)/$(BASH_SOURCE)
 
 bash-source: $(DL_DIR)/$(BASH_SOURCE)
 
diff --git a/make/berkeleydb.mk b/make/berkeleydb.mk
index 26b696c473..09680ef5f0 100644
--- a/make/berkeleydb.mk
+++ b/make/berkeleydb.mk
@@ -9,7 +9,7 @@ DB_DIR:=$(BUILD_DIR)/db-4.0.14
 
 
 $(DL_DIR)/$(DB_SOURCE):
-	wget -P $(DL_DIR) --passive-ftp $(DB_SITE)/$(DB_SOURCE)
+	$(WGET) -P $(DL_DIR) $(DB_SITE)/$(DB_SOURCE)
 
 db-source: $(DL_DIR)/$(DB_SOURCE)
 
diff --git a/make/boa.mk b/make/boa.mk
index 39c4a33666..2019b78921 100644
--- a/make/boa.mk
+++ b/make/boa.mk
@@ -15,7 +15,7 @@ BOA_DIR=$(BUILD_DIR)/${shell basename $(BOA_SOURCE) .tar.gz}
 BOA_WORKDIR=$(BUILD_DIR)/boa_workdir
 
 $(DL_DIR)/$(BOA_SOURCE):
-	wget -P $(DL_DIR) $(BOA_SITE)/$(BOA_SOURCE)
+	$(WGET) -P $(DL_DIR) $(BOA_SITE)/$(BOA_SOURCE)
 
 $(BOA_DIR)/.unpacked:	$(DL_DIR)/$(BOA_SOURCE)
 	gzip -d -c $(DL_DIR)/$(BOA_SOURCE) | tar -C $(BUILD_DIR) -xvf -
diff --git a/make/busybox.mk b/make/busybox.mk
index dc37607e2b..f66823e26d 100644
--- a/make/busybox.mk
+++ b/make/busybox.mk
@@ -20,7 +20,7 @@ BUSYBOX_PATCH:=$(SOURCE_DIR)/busybox.patch
 endif
 
 $(DL_DIR)/$(BUSYBOX_SOURCE):
-	 wget -P $(DL_DIR) --passive-ftp $(BUSYBOX_SITE)/$(BUSYBOX_SOURCE)
+	 $(WGET) -P $(DL_DIR) $(BUSYBOX_SITE)/$(BUSYBOX_SOURCE)
 
 busybox-source: $(DL_DIR)/$(BUSYBOX_SOURCE) $(BUSYBOX_PATCH)
 
diff --git a/make/coreutils.mk b/make/coreutils.mk
index 5e1bf351b2..c02839b8e4 100644
--- a/make/coreutils.mk
+++ b/make/coreutils.mk
@@ -13,7 +13,7 @@ BIN_PROGS:=cat chgrp chmod chown cp date dd df dir echo false ln ls mkdir \
 	mknod mv pwd rm rmdir vdir sleep stty sync touch true uname
 
 $(DL_DIR)/$(COREUTILS_SOURCE):
-	 wget -P $(DL_DIR) $(COREUTILS_SITE)/$(COREUTILS_SOURCE)
+	 $(WGET) -P $(DL_DIR) $(COREUTILS_SITE)/$(COREUTILS_SOURCE)
 
 coreutils-source: $(DL_DIR)/$(COREUTILS_SOURCE)
 
diff --git a/make/ext2root.mk b/make/ext2root.mk
index a6b8d26c5a..6777d02dda 100644
--- a/make/ext2root.mk
+++ b/make/ext2root.mk
@@ -9,7 +9,7 @@ GENEXT2_SITE=http://ftp.debian.org/debian/pool/main/g/genext2fs
 GENEXT2_PATCH=$(SOURCE_DIR)/genext2fs.patch
 
 $(DL_DIR)/$(GENEXT2_SOURCE):
-	wget -P $(DL_DIR) --passive-ftp $(GENEXT2_SITE)/$(GENEXT2_SOURCE)
+	$(WGET) -P $(DL_DIR) $(GENEXT2_SITE)/$(GENEXT2_SOURCE)
 
 $(GENEXT2_DIR): $(DL_DIR)/$(GENEXT2_SOURCE) $(GENEXT2_PATCH)
 	zcat $(DL_DIR)/$(GENEXT2_SOURCE) | tar -C $(BUILD_DIR) -xvf -
diff --git a/make/findutils.mk b/make/findutils.mk
index 1fa326cba9..2323dd7135 100644
--- a/make/findutils.mk
+++ b/make/findutils.mk
@@ -11,7 +11,7 @@ FINDUTILS_BINARY:=find/find
 FINDUTILS_TARGET_BINARY:=usr/bin/find
 
 $(DL_DIR)/$(FINDUTILS_SOURCE):
-	 wget -P $(DL_DIR) $(FINDUTILS_SITE)/$(FINDUTILS_SOURCE)
+	 $(WGET) -P $(DL_DIR) $(FINDUTILS_SITE)/$(FINDUTILS_SOURCE)
 
 findutils-source: $(DL_DIR)/$(FINDUTILS_SOURCE)
 
diff --git a/make/gawk.mk b/make/gawk.mk
index e72e663586..3569e32d64 100644
--- a/make/gawk.mk
+++ b/make/gawk.mk
@@ -11,7 +11,7 @@ GAWK_BINARY:=gawk
 GAWK_TARGET_BINARY:=usr/bin/gawk
 
 $(DL_DIR)/$(GAWK_SOURCE):
-	 wget -P $(DL_DIR) $(GAWK_SITE)/$(GAWK_SOURCE)
+	 $(WGET) -P $(DL_DIR) $(GAWK_SITE)/$(GAWK_SOURCE)
 
 gawk-source: $(DL_DIR)/$(GAWK_SOURCE)
 
diff --git a/make/gdb.mk b/make/gdb.mk
index bc8a4b7577..7d90c21d49 100644
--- a/make/gdb.mk
+++ b/make/gdb.mk
@@ -9,7 +9,7 @@ GDB_DIR:=$(BUILD_DIR)/gdb-5.2
 GDB_SOURCE:=gdb-5.2.tar.gz
 
 $(DL_DIR)/$(GDB_SOURCE):
-	wget -P $(DL_DIR) --passive-ftp $(GDB_SITE)/$(GDB_SOURCE)
+	$(WGET) -P $(DL_DIR) $(GDB_SITE)/$(GDB_SOURCE)
 
 $(GDB_DIR)/.unpacked: $(DL_DIR)/$(GDB_SOURCE)
 	gunzip -c $(DL_DIR)/$(GDB_SOURCE) | tar -C $(BUILD_DIR) -xvf -
diff --git a/make/libglib12.mk b/make/libglib12.mk
index f9beb21f3b..2ddb03c032 100644
--- a/make/libglib12.mk
+++ b/make/libglib12.mk
@@ -10,7 +10,7 @@ LIBGLIB12_DIR:=$(BUILD_DIR)/glib-1.2.10
 LIBGLIB12_BINARY:=libglib-1.2.so.0.0.10
 
 $(DL_DIR)/$(LIBGLIB12_SOURCE):
-	 wget -P $(DL_DIR) $(LIBGLIB12_SITE)/$(LIBGLIB12_SOURCE)
+	 $(WGET) -P $(DL_DIR) $(LIBGLIB12_SITE)/$(LIBGLIB12_SOURCE)
 
 libglib12-source: $(DL_DIR)/$(LIBGLIB12_SOURCE)
 
diff --git a/make/links.mk b/make/links.mk
index a5f25b353f..40c2aee7be 100644
--- a/make/links.mk
+++ b/make/links.mk
@@ -8,7 +8,7 @@ LINKS_SOURCE:=links-0.97pre9-no-ssl.tar.gz
 LINKS_DIR:=$(BUILD_DIR)/links-0.97pre9-no-ssl
 
 $(DL_DIR)/$(LINKS_SOURCE):
-	wget -P $(DL_DIR) --passive-ftp $(LINKS_SITE)/$(LINKS_SOURCE)
+	$(WGET) -P $(DL_DIR) $(LINKS_SITE)/$(LINKS_SOURCE)
 
 links-source: $(DL_DIR)/$(LINKS_SOURCE)
 
diff --git a/make/make.mk b/make/make.mk
index 2300218d32..9fc8f7f5c5 100644
--- a/make/make.mk
+++ b/make/make.mk
@@ -11,7 +11,7 @@ GNUMAKE_BINARY:=make
 GNUMAKE_TARGET_BINARY:=usr/bin/make
 
 $(DL_DIR)/$(GNUMAKE_SOURCE):
-	 wget -P $(DL_DIR) $(GNUMAKE_SITE)/$(GNUMAKE_SOURCE)
+	 $(WGET) -P $(DL_DIR) $(GNUMAKE_SITE)/$(GNUMAKE_SOURCE)
 
 make-source: $(DL_DIR)/$(GNUMAKE_SOURCE)
 
diff --git a/make/ncurses.mk b/make/ncurses.mk
index 8a8a5a009d..f8a90ad082 100644
--- a/make/ncurses.mk
+++ b/make/ncurses.mk
@@ -5,7 +5,7 @@
 #
 #############################################################
 # Copyright (C) 2002 by Ken Restivo <ken@246gt.com>
-# $Id: ncurses.mk,v 1.8 2002/07/23 23:51:46 andersen Exp $
+# $Id: ncurses.mk,v 1.9 2002/11/20 23:16:08 andersen Exp $
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU Library General Public License as
@@ -28,7 +28,7 @@ NCURSES_DIR:=$(BUILD_DIR)/ncurses-5.2
 NCURSES_SOURCE:=ncurses-5.2.tar.gz
 
 $(DL_DIR)/$(NCURSES_SOURCE):
-	wget -P $(DL_DIR) --passive-ftp $(NCURSES_SITE)/$(NCURSES_SOURCE)
+	$(WGET) -P $(DL_DIR) $(NCURSES_SITE)/$(NCURSES_SOURCE)
 
 $(NCURSES_DIR)/.dist: $(DL_DIR)/$(NCURSES_SOURCE)
 	gunzip -c $(DL_DIR)/$(NCURSES_SOURCE) | tar -C $(BUILD_DIR) -xvf -
diff --git a/make/newt.mk b/make/newt.mk
index 3075dd8b25..54db8eb947 100644
--- a/make/newt.mk
+++ b/make/newt.mk
@@ -14,7 +14,7 @@ NEWT_CFLAGS="-Os -g -fPIC"
 endif
 
 $(DL_DIR)/$(NEWT_SOURCE):
-	wget -P $(DL_DIR) $(NEWT_SITE)/$(NEWT_SOURCE)
+	$(WGET) -P $(DL_DIR) $(NEWT_SITE)/$(NEWT_SOURCE)
 
 $(NEWT_DIR)/.source: $(DL_DIR)/$(NEWT_SOURCE) $(NEWT_PATCH)
 	zcat $(DL_DIR)/$(NEWT_SOURCE) | tar -C $(BUILD_DIR) -xvf -
diff --git a/make/openssh.mk b/make/openssh.mk
index ff985dcfc3..5898577bec 100644
--- a/make/openssh.mk
+++ b/make/openssh.mk
@@ -10,7 +10,7 @@ OPENSSH_SOURCE:=openssh-3.4p1.tar.gz
 OPENSSH_PATCH:=$(SOURCE_DIR)/openssh_3.4p1-4.diff.gz
 
 $(DL_DIR)/$(OPENSSH_SOURCE):
-	wget -P $(DL_DIR) --passive-ftp $(OPENSSH_SITE)/$(OPENSSH_SOURCE)
+	$(WGET) -P $(DL_DIR) $(OPENSSH_SITE)/$(OPENSSH_SOURCE)
 
 $(OPENSSH_DIR)/.unpacked: $(DL_DIR)/$(OPENSSH_SOURCE)
 	zcat $(DL_DIR)/$(OPENSSH_SOURCE) | tar -C $(BUILD_DIR) -xvf -
diff --git a/make/openssl.mk b/make/openssl.mk
index 14c6379f6d..779a6ade85 100644
--- a/make/openssl.mk
+++ b/make/openssl.mk
@@ -11,7 +11,7 @@ OPENSSL_DIR:=$(BUILD_DIR)/openssl-0.9.6g
 
 
 $(DL_DIR)/$(OPENSSL_SOURCE):
-	wget -P $(DL_DIR) --passive-ftp $(OPENSSL_SITE)/$(OPENSSL_SOURCE)
+	$(WGET) -P $(DL_DIR) $(OPENSSL_SITE)/$(OPENSSL_SOURCE)
 
 $(OPENSSL_DIR)/.unpacked: $(DL_DIR)/$(OPENSSL_SOURCE)
 	gunzip -c $(DL_DIR)/$(OPENSSL_SOURCE) | tar -C $(BUILD_DIR) -xvf -
diff --git a/make/sed.mk b/make/sed.mk
index cbd7780da2..f62d70d062 100644
--- a/make/sed.mk
+++ b/make/sed.mk
@@ -11,7 +11,7 @@ SED_BINARY:=sed/sed
 SED_TARGET_BINARY:=bin/sed
 
 $(DL_DIR)/$(SED_SOURCE):
-	 wget -P $(DL_DIR) $(SED_SITE)/$(SED_SOURCE)
+	 $(WGET) -P $(DL_DIR) $(SED_SITE)/$(SED_SOURCE)
 
 sed-source: $(DL_DIR)/$(SED_SOURCE)
 
diff --git a/make/slang.mk b/make/slang.mk
index 5eafe16c7b..b0f89059f4 100644
--- a/make/slang.mk
+++ b/make/slang.mk
@@ -13,7 +13,7 @@ SLANG_CFLAGS="-Os -g -fPIC"
 endif
 
 $(DL_DIR)/$(SLANG_SOURCE):
-	wget -P $(DL_DIR) $(SLANG_SITE)/$(SLANG_SOURCE)
+	$(WGET) -P $(DL_DIR) $(SLANG_SITE)/$(SLANG_SOURCE)
 
 $(SLANG_DIR): $(DL_DIR)/$(SLANG_SOURCE)
 	zcat $(DL_DIR)/$(SLANG_SOURCE) | tar -C $(BUILD_DIR) -xvf -
diff --git a/make/socat.mk b/make/socat.mk
index cf32e6f693..56d545d928 100644
--- a/make/socat.mk
+++ b/make/socat.mk
@@ -17,7 +17,7 @@ SOCAT_DIR=$(BUILD_DIR)/socat-1.3
 SOCAT_WORKDIR=$(SOCAT_DIR)
 
 $(DL_DIR)/$(SOCAT_SOURCE):
-	wget -P $(DL_DIR) $(SOCAT_SITE)/$(SOCAT_SOURCE)
+	$(WGET) -P $(DL_DIR) $(SOCAT_SITE)/$(SOCAT_SOURCE)
 
 $(SOCAT_DIR)/.unpacked:	$(DL_DIR)/$(SOCAT_SOURCE)
 	bzip2 -d -c $(DL_DIR)/$(SOCAT_SOURCE) | tar -C $(BUILD_DIR) -xvf -
diff --git a/make/stlport.mk b/make/stlport.mk
index fecf90136c..875fed42e6 100644
--- a/make/stlport.mk
+++ b/make/stlport.mk
@@ -26,7 +26,7 @@ STLPORT_SOURCE=STLport-4.5.3.tar.gz
 STLPORT_PATCH=$(SOURCE_DIR)/STLport-4.5.3.patch
 
 $(DL_DIR)/$(STLPORT_SOURCE):
-	wget -P $(DL_DIR) --passive-ftp $(STLPORT_SITE)/$(STLPORT_SOURCE)
+	$(WGET) -P $(DL_DIR) $(STLPORT_SITE)/$(STLPORT_SOURCE)
 
 stlport-source: $(DL_DIR)/$(STLPORT_SOURCE) $(STLPORT_PATCH)
 
diff --git a/make/strace.mk b/make/strace.mk
index d2dc697b1c..84b055e01b 100644
--- a/make/strace.mk
+++ b/make/strace.mk
@@ -5,7 +5,7 @@
 # Maintainer: Ken Restivo <ken@246gt.com>
 #
 #############################################################
-#$Id: strace.mk,v 1.2 2002/05/31 10:43:51 andersen Exp $
+#$Id: strace.mk,v 1.3 2002/11/20 23:16:09 andersen Exp $
 
 # TARGETS
 STRACE_SITE:=http://telia.dl.sourceforge.net/sourceforge/strace
@@ -13,7 +13,7 @@ STRACE_SOURCE:=strace_4.4-1.tar.gz
 STRACE_DIR:=$(BUILD_DIR)/strace-4.4
 
 $(DL_DIR)/$(STRACE_SOURCE):
-	wget -P $(DL_DIR) --passive-ftp $(STRACE_SITE)/$(STRACE_SOURCE)
+	$(WGET) -P $(DL_DIR) $(STRACE_SITE)/$(STRACE_SOURCE)
 
 strace-source: $(DL_DIR)/$(STRACE_SOURCE)
 
diff --git a/make/tinylogin.mk b/make/tinylogin.mk
index 93cf3fed21..2e83d24713 100644
--- a/make/tinylogin.mk
+++ b/make/tinylogin.mk
@@ -10,7 +10,7 @@ TINYLOGIN_SOURCE:=tinylogin-1.02.tar.bz2
 TINYLOGIN_SITE:=http://tinylogin.busybox.net/downloads
 
 $(DL_DIR)/$(TINYLOGIN_SOURCE):
-	wget -P $(DL_DIR) --passive-ftp $(TINYLOGIN_SITE)/$(TINYLOGIN_SOURCE)
+	$(WGET) -P $(DL_DIR) $(TINYLOGIN_SITE)/$(TINYLOGIN_SOURCE)
 
 tinylogin-source: $(DL_DIR)/$(TINYLOGIN_SOURCE)
 
diff --git a/make/uclibc.mk b/make/uclibc.mk
index 41e8f4093e..9cdbebaf26 100644
--- a/make/uclibc.mk
+++ b/make/uclibc.mk
@@ -41,7 +41,7 @@ LARGEFILE=false
 endif
 
 $(DL_DIR)/$(UCLIBC_SOURCE):
-	wget -P $(DL_DIR) --passive-ftp $(UCLIBC_SITE)/$(UCLIBC_SOURCE)
+	$(WGET) -P $(DL_DIR) $(UCLIBC_SITE)/$(UCLIBC_SOURCE)
 
 uclibc-source: $(DL_DIR)/$(UCLIBC_SOURCE) #$(UCLIBC_PATCH)
 
diff --git a/make/uclibc_toolchain.mk b/make/uclibc_toolchain.mk
index 16152f7fa2..2dc6833f02 100644
--- a/make/uclibc_toolchain.mk
+++ b/make/uclibc_toolchain.mk
@@ -106,7 +106,7 @@ uclibc_toolchain-dirclean: gcc_final-dirclean uclibc-dirclean gcc_initial-dircle
 #
 #############################################################
 $(DL_DIR)/$(BINUTILS_SOURCE):
-	wget -P $(DL_DIR) --passive-ftp $(BINUTILS_SITE)/$(BINUTILS_SOURCE)
+	$(WGET) -P $(DL_DIR) $(BINUTILS_SITE)/$(BINUTILS_SOURCE)
 
 $(BINUTILS_DIR)/.unpacked: $(BUILD_DIR)/.setup $(DL_DIR)/$(BINUTILS_SOURCE)
 	bzcat $(DL_DIR)/$(BINUTILS_SOURCE) | tar -C $(BUILD_DIR) -xvf -
@@ -166,7 +166,7 @@ binutils-dirclean:
 #
 #############################################################
 $(DL_DIR)/$(GCC_SOURCE):
-	wget -P $(DL_DIR) --passive-ftp $(GCC_SITE)/$(GCC_SOURCE)
+	$(WGET) -P $(DL_DIR) $(GCC_SITE)/$(GCC_SOURCE)
 
 $(GCC_DIR)/.unpacked: $(BUILD_DIR)/.setup $(DL_DIR)/$(GCC_SOURCE)
 	zcat $(DL_DIR)/$(GCC_SOURCE) | tar -C $(BUILD_DIR) -xvf -
@@ -227,7 +227,7 @@ gcc_initial-dirclean:
 #
 #############################################################
 $(DL_DIR)/$(UCLIBC_SOURCE):
-	wget -P $(DL_DIR) $(UCLIBC_SITE)/$(UCLIBC_SOURCE)
+	$(WGET) -P $(DL_DIR) $(UCLIBC_SITE)/$(UCLIBC_SOURCE)
 
 $(UCLIBC_DIR)/.unpacked: $(BUILD_DIR)/.setup $(DL_DIR)/$(UCLIBC_SOURCE)
 	bzcat $(DL_DIR)/$(UCLIBC_SOURCE) | tar -C $(BUILD_DIR) -xvf -
diff --git a/make/udhcp.mk b/make/udhcp.mk
index 1a98b1e17c..9aaafe4c19 100644
--- a/make/udhcp.mk
+++ b/make/udhcp.mk
@@ -26,7 +26,7 @@ UDHCP_SITE:=http://udhcp.busybox.net/downloads/
 UDHCP_DIR:=$(BUILD_DIR)/udhcp-0.9.8
 
 $(DL_DIR)/$(UDHCP_SOURCE):
-	wget -P $(DL_DIR) $(UDHCP_SITE)/$(UDHCP_SOURCE)
+	$(WGET) -P $(DL_DIR) $(UDHCP_SITE)/$(UDHCP_SOURCE)
 
 udhcp-source: $(DL_DIR)/$(UDHCP_SOURCE)
 
diff --git a/make/user-mode-linux.mk b/make/user-mode-linux.mk
index f7dddccc76..40c1cc3542 100644
--- a/make/user-mode-linux.mk
+++ b/make/user-mode-linux.mk
@@ -12,10 +12,10 @@ UMLINUX_PATCH_1_SITE:=http://telia.dl.sourceforge.net/sourceforge/user-mode-linu
 UMLINUX_KCONFIG=$(SOURCE_DIR)/linux-uml.config
 
 $(DL_DIR)/$(UMLINUX_SOURCE):
-	wget -P $(DL_DIR) --passive-ftp $(UMLINUX_SITE)/$(UMLINUX_SOURCE)
+	$(WGET) -P $(DL_DIR) $(UMLINUX_SITE)/$(UMLINUX_SOURCE)
 
 $(DL_DIR)/$(UMLINUX_PATCH_1):
-	wget -P $(DL_DIR) --passive-ftp $(UMLINUX_PATCH_1_SITE)/$(UMLINUX_PATCH_1)
+	$(WGET) -P $(DL_DIR) $(UMLINUX_PATCH_1_SITE)/$(UMLINUX_PATCH_1)
 
 user-mode-linux-source: $(DL_DIR)/$(UMLINUX_SOURCE) $(DL_DIR)/$(UMLINUX_PATCH_1)
 
diff --git a/make/valgrind.mk b/make/valgrind.mk
index 50ffa23aad..52a6d9a1ad 100644
--- a/make/valgrind.mk
+++ b/make/valgrind.mk
@@ -10,7 +10,7 @@ VALGRIND_SOURCE:=valgrind-1.0.1.tar.bz2
 VALGRIND_PATCH:=$(SOURCE_DIR)/valgrind.patch
 
 $(DL_DIR)/$(VALGRIND_SOURCE):
-	wget -P $(DL_DIR) --passive-ftp $(VALGRIND_SITE)/$(VALGRIND_SOURCE)
+	$(WGET) -P $(DL_DIR) $(VALGRIND_SITE)/$(VALGRIND_SOURCE)
 
 $(VALGRIND_DIR)/.unpacked: $(DL_DIR)/$(VALGRIND_SOURCE)
 	bzcat $(DL_DIR)/$(VALGRIND_SOURCE) | tar -C $(BUILD_DIR) -xvf -
diff --git a/make/zlib.mk b/make/zlib.mk
index 88edecb09b..ef28bde180 100644
--- a/make/zlib.mk
+++ b/make/zlib.mk
@@ -13,7 +13,7 @@ ZLIB_CFLAGS="-Os -g -fPIC"
 endif
 
 $(DL_DIR)/$(ZLIB_SOURCE):
-	wget -P $(DL_DIR) $(ZLIB_SITE)/$(ZLIB_SOURCE)
+	$(WGET) -P $(DL_DIR) $(ZLIB_SITE)/$(ZLIB_SOURCE)
 
 $(ZLIB_DIR)/.source: $(DL_DIR)/$(ZLIB_SOURCE)
 	bzcat $(DL_DIR)/$(ZLIB_SOURCE) | tar -C $(BUILD_DIR) -xvf -