diff --git a/Makefile b/Makefile
index cd0fb321..30e6d42d 100644
--- a/Makefile
+++ b/Makefile
@@ -90,3 +90,13 @@ uninstall:
rm -vf $(prefix)/bin/jq
rm -vf $(mandir)/man1/jq.1
+
+www: docs/output www_binaries
+
+docs/output:
+ cd docs; rake build
+
+www_binaries: docs/output binaries
+ $(foreach platform, $(PLATFORMS), $(foreach binary, $(BINARIES), \
+ mkdir -p docs/output/download/$(platform); \
+ cp build/$(platform)/$(binary) docs/output/download/$(platform)/$(binary); ))
diff --git a/docs/content/2.download/default.yml b/docs/content/2.download/default.yml
index 833cac84..f364277b 100644
--- a/docs/content/2.download/default.yml
+++ b/docs/content/2.download/default.yml
@@ -5,39 +5,46 @@ body:
jq is written in C and has no runtime dependencies, so it should be
possible to build it for nearly any platform. Prebuilt binaries are
- available for Linux (64-bit x86) and OS X.
-
- * [Download binary for 64-bit Linux](linux_x86_64/jq)
- * [Download binary for OS X](osx_64/jq)
- (or use [homebrew](http://mxcl.github.com/homebrew/): `brew install jq`)
- * [Download source](source/jq.tgz)
+ available for Linux, OS X and Windows.
- The binaries should just run, but you may need to make them
- executable first using:
+ The binaries should just run, but on OS X and Linux you may need
+ to make them executable first using `chmod +x jq`.
- chmod +x jq
-
jq is licensed under the MIT license. For all of the gory
details, read the file `COPYING` in the source distribution.
- Arch Linux
- ----------
- A PKGBUILD for jq-1.1 is in the
- [AUR](https://aur.archlinux.org/packages.php?ID=63849), as well as a
- PKGBUILD for the HEAD of master
- ([jq-git](https://aur.archlinux.org/packages.php?ID=63850)).
+ ### Linux
+
+ * Binaries for [64-bit](linux64/jq) or [32-bit](linux32/jq) systems.
- You can install jq using [Yaourt](https://wiki.archlinux.org/index.php/Yaourt)
- or manually by following instructions on
- [Arch Linux's Wiki](https://wiki.archlinux.org/index.php/Arch_User_Repository).
+ * For Arch users, a PKGBUILD for jq-1.1 is in the
+ [AUR](https://aur.archlinux.org/packages.php?ID=63849), as
+ well as a PKGBUILD for the HEAD of master
+ ([jq-git](https://aur.archlinux.org/packages.php?ID=63850)).
+ You can install them using
+ [Yaourt](https://wiki.archlinux.org/index.php/Yaourt) or
+ manually by following instructions on [Arch Linux's
+ Wiki](https://wiki.archlinux.org/index.php/Arch_UseRepository).
- Hacking on jq
- =============
+ * Debian/Ubuntu packages are coming Real Soon Now.
- If you want to work on jq, grab the source from
- [https://github.com/stedolan/jq](https://github.com/stedolan/jq).
-
+ ### OS X
+
+ * `brew install jq` using [homebrew](http://mxcl.github.com/homebrew/)
+
+ * Or, grab prebuilt [64-bit binaries](osx64/jq) or [32-bit
+ binaries](osx32/jq)
+
+ ### Windows
+
+ * Executables for [64-bit](win64/jq) or [32-bit](win32/jq)
+
+ ### From source on Linux or OS X
+
+ git clone https://github.com/stedolan/jq.git
+ cd jq
+ make && sudo make install
To build it from a git clone, you'll need to install a few
packages first:
@@ -48,11 +55,6 @@ body:
* [GCC](http://gcc.gnu.org)
* [Make](http://www.gnu.org/software/make)
- Most of these aren't necessary if you're just trying to compile
- jq from the released tarball - that version has the
- non-platform-specific build steps already done, so you'll only
- need a C compiler and `make` to finish it off.
-
For Linux systems, these will all be in your system's package
manager, and if you do development on the machine they're most
likely already installed.
@@ -67,9 +69,10 @@ body:
jq, and some python scripts generate the UTF8 encoding tables
needed for JSON parsing.
- Building the documentation
- --
+ #### Building the documentation
jq's documentation is compiled into static HTML using
[Bonsai](http://www.tinytree.info). To view the documentation
locally, run `rake serve` from the docs/ subdirectory.
+
+
diff --git a/docs/content/2.download/linux_x86_64/jq b/docs/content/2.download/linux_x86_64/jq
deleted file mode 100755
index 4395acc1..00000000
Binary files a/docs/content/2.download/linux_x86_64/jq and /dev/null differ
diff --git a/docs/content/2.download/osx_64/jq b/docs/content/2.download/osx_64/jq
deleted file mode 100755
index c7b521ec..00000000
Binary files a/docs/content/2.download/osx_64/jq and /dev/null differ
diff --git a/docs/templates/index.liquid b/docs/templates/index.liquid
index aaff1c9f..7785526c 100644
--- a/docs/templates/index.liquid
+++ b/docs/templates/index.liquid
@@ -16,8 +16,8 @@
<span class="caret"></span>
</a>
<ul class="dropdown-menu">
- <li><a href="{{root}}/download/linux_x86_64/jq">Linux (x86_64)</a></li>
- <li><a href="{{root}}/download/osx_64/jq">OS X (64-bit)</a></li>
+ <li><a href="{{root}}/download/linux64/jq">Linux (64-bit)</a></li>
+ <li><a href="{{root}}/download/osx64/jq">OS X (64-bit)</a></li>
<li><a href="{{root}}/download">Other platforms and source</a></li>
</ul>
</div>