Update documentation, setup.sh

2 files changed, 9 insertions, 10 deletions

diff --git a/README b/README
index 84907c4..409f9f4 100644
--- a/README
+++ b/README
@@ -3,21 +3,20 @@ This is a WIP HTML5 implementation of the game Katawa Shoujo. [0]
 == Requirements ==
 - Katawa Shoujo (obviously)
 - Firefox/Chrome/a sensible browser (i.e. not IE)
-- Bash
-- ffmpeg with fdk-aac, libtheora, libvpx, libx264
-- opusenc from opus-tools
-- TruePNG
-- DeflOpt
+- a shell (Bash, dash, zsh, etc)
+- ffmpeg with fdk-aac, libopus, libtheora, libvpx, libx264
 - defluff
 - pngquant
-- recommended: jpegmini
-- jpegrescan
 - cwebp and webpmux from libwebp
-- ImageMagick
+- convert from ImageMagick
 - apngasm
 - uglifyjs
 
 === Recommended ===
+- jpegmini
+- jpegtran
+- jpegrescan
+- defluff
 - nginx
 - zopfli
 
diff --git a/setup.sh b/setup.sh
index c9f1f00..97001b2 100755
--- a/setup.sh
+++ b/setup.sh
@@ -7,7 +7,7 @@ cd $(dirname $0)
 git submodule update --init
 
 pushd unrpyc
-make ${MAKEOPTS} install
+make $MAKEOPTS install
 popd
 
-make ${MAKEOPTS}
+make $MAKEOPTS