X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/194eaeb68792565c85b93dc8ca7cfe64e1ed919e..e3c8a57184679bb589709b0d346844a395f4a9a7:/INSTALL.md?ds=sidebyside

diff --git a/INSTALL.md b/INSTALL.md
index afd0a55c4..768cbd540 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -30,10 +30,10 @@ These can be installed on Ubuntu 16.04 or later with:
 ```
 sudo apt-get install ruby2.3 libruby2.3 ruby2.3-dev \
                      libmagickwand-dev libxml2-dev libxslt1-dev nodejs \
-                     apache2 apache2-threaded-dev build-essential git-core \
+                     apache2 apache2-dev build-essential git-core \
                      postgresql postgresql-contrib libpq-dev postgresql-server-dev-all \
-                     libsasl2-dev imagemagick
-sudo gem2.0 install bundler
+                     libsasl2-dev imagemagick libffi-dev
+sudo gem2.3 install bundler
 ```
 
 ### Alternative platforms
@@ -47,7 +47,7 @@ sudo yum install ruby ruby-devel rubygem-rdoc rubygem-bundler rubygems \
                  libxml2-devel js \
                  gcc gcc-c++ git \
                  postgresql postgresql-server postgresql-contrib postgresql-devel \
-                 perl-podlators ImageMagick
+                 perl-podlators ImageMagick libffi-devel
 ```
 
 If you didn't already have PostgreSQL installed then create a PostgreSQL instance and start the server:
@@ -69,7 +69,7 @@ For MacOSX, you will need XCode installed from the Mac App Store; OS X 10.7 (Lio
 
 Installing PostgreSQL:
 
-* Install Postgres.app from http://postgresapp.com/
+* Install Postgres.app from https://postgresapp.com/
 * Add PostgreSQL to your path, by editing your profile:
 
 `nano ~/.profile`
@@ -80,9 +80,11 @@ and adding:
 
 Installing other dependencies:
 
-* Install Homebrew from http://mxcl.github.io/homebrew/
+* 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 --with-xml2-config`
+* If you want to run the tests, you need `phantomjs` as well: `brew install phantomjs`
 * Install Bundler: `gem install bundler`
 
 Note that OS X does not have a /home directory by default, so if you are using the GPX functions, you will need to change the directories specified in config/application.yml.