From: Tom Hughes Date: Mon, 17 Feb 2020 10:22:12 +0000 (+0000) Subject: Merge remote-tracking branch 'upstream/pull/2540' X-Git-Tag: live~2830 X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/ca5ca5d42670eb485b10cf0856e40d270acd19a9?hp=5c0fa6a0b9cf103eb7658bd6e84a46e8c5d9bc97 Merge remote-tracking branch 'upstream/pull/2540' --- diff --git a/INSTALL.md b/INSTALL.md index d799f6586..bd62d8ac6 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -86,17 +86,7 @@ Installing other dependencies: * Install Homebrew from https://brew.sh/ * Install the latest version of Ruby: `brew install ruby` -* Install ImageMagick: `brew install imagemagick` -* Install libxml2: `brew install libxml2` -* Install libgd: `brew install gd` -* Install Yarn: `brew install yarn` -* Install pngcrush: `brew install pngcrush` -* Install optipng: `brew install optipng` -* Install pngquant: `brew install pngquant` -* Install jhead: `brew install jhead` -* Install jpegoptim: `brew install jpegoptim` -* Install gifsicle: `brew install gifsicle` -* Install svgo: `brew install svgo` +* Install other dependencies: `brew install imagemagick libxml2 gd yarn pngcrush optipng pngquant jhead jpegoptim gifsicle svgo` * Install Bundler: `gem install bundler` (you might need to `sudo gem install bundler` if you get an error about permissions - or see note below about [developer Ruby setup](#rbenv)) You will need to tell `bundler` that `libxml2` is installed in a Homebrew location. If it uses the system-installed one then you will get errors installing the `libxml-ruby` gem later on. @@ -311,4 +301,4 @@ Where `$VERSION` is the version you installed. Then install bundler: gem install bundler ``` -You should now be able to proceed with the rest of the installation. If you're on MacOSX, make sure you set up the [config override for the libxml2 location](#macosx-bundle-config) _after_ installing bundler. +You should now be able to proceed with the rest of the installation. If you're on MacOSX, make sure you set up the [config override for the libxml2 location])(#macosx-bundle-config) _after_ installing bundler.