Merge branch 'master' of git.distorted.org.uk:~mdw/publish/public-git/distorted-chroo...

* 'master' of git.distorted.org.uk:~mdw/publish/public-git/distorted-chroot:
  Makefile: Don't commit to `PROXY' before we know `$(APTCONF)'.

diff --git a/Makefile b/Makefile
index a2ba217..3a3d48a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -64,7 +64,7 @@ APTCONF                        = $(notdir $(wildcard etc/apt-conf.d/[0-9]*[!~]))
 
 ## Proxy setting.
 CONFIG_VARS            += PROXY
-PROXY                  := $(shell \
+PROXY                   = $(shell \
        eval $$(apt-config $(foreach a,$(APTCONF),-cetc/apt-conf.d/$a) \
                shell proxy Acquire::http::proxy); \
        case $${proxy+t} in (t) echo "$$proxy" ;; (*) echo nil ;; esac)