Makefile,docs: tahoe-deps.tar.gz now lives in separate source/deps/ directory on...

diff --git a/Makefile b/Makefile
index 2f6aeffd33cb921727b25e8d7c31f42043da2262..18a5f5ee4067321d6d5ce4c80c990a70f4168da4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -251,7 +251,7 @@ find-trailing-spaces:
 # support/lib/ directory is gone.
 
 fetch-and-unpack-deps:
-       test -f tahoe-deps.tar.gz || wget http://allmydata.org/source/tahoe/tarballs/tahoe-deps.tar.gz
+       test -f tahoe-deps.tar.gz || wget http://allmydata.org/source/tahoe/deps/tahoe-deps.tar.gz
        rm -rf tahoe-deps
        tar xf tahoe-deps.tar.gz
 

diff --git a/docs/install.html b/docs/install.html
index 9c4a8c81ae19ce14e6653e1dc3d8336486f53b95..f217d61c17239371ef1f799f8cf1caa12af417b0 100644 (file)
--- a/docs/install.html
+++ b/docs/install.html
@@ -42,7 +42,7 @@
       automatically-installable dependencies; use the smaller regular tarball
       if you don't mind the build process downloading the things it needs, or
       if you've downloaded and unpacked the <tt><a
-      href="http://allmydata.org/source/tahoe/tarballs/tahoe-deps.tar.gz">http://allmydata.org/source/tahoe/tarballs/tahoe-deps.tar.gz</a></tt>
+      href="http://allmydata.org/source/tahoe/deps/tahoe-deps.tar.gz">http://allmydata.org/source/tahoe/deps/tahoe-deps.tar.gz</a></tt>
       bundle.</p>
 
 

diff --git a/setup.cfg b/setup.cfg
index 4c7ef133e74e12c7560841adaeb8282de3e2d1d8..cc4dd286a1d3644ae722f300228c2dc7ea85e4a6 100644 (file)
--- a/setup.cfg
+++ b/setup.cfg
@@ -7,10 +7,10 @@ zip_ok=False
 # causes setuptools to look for these dependent tarballs in tahoe-deps/ and
 # ../tahoe-deps/ before it resorts to downloading them from PyPI.
 
-# http://allmydata.org/source/tahoe/tarballs/tahoe-deps.tar.gz contains a
-# bundle of these dependencies. So it you want to avoid the build-time
-# download (say, if you're on an airplane, or a desert island), just grab a
-# copy and unpack it in your tahoe darcs tree.
+# http://allmydata.org/source/tahoe/deps/tahoe-deps.tar.gz contains a bundle
+# of these dependencies. So it you want to avoid the build-time download
+# (say, if you're on an airplane, or a desert island), just grab a copy and
+# unpack it in your tahoe darcs tree.
 
 # Alternatively, if you're building from a release/nightly tarball instead of
 # a darcs tree, the 'sumo' tarball variant will include all of these