Fix coding style.

[nominatim.git] / vagrant / centos-7-provision.sh

diff --git a/vagrant/centos-7-provision.sh b/vagrant/centos-7-provision.sh
index 93139a23d2a9873b2ec59c1d79d975d9f314aac9..db9d1b4f00823062e9598603fa953ba7fad140d7 100644 (file)
--- a/vagrant/centos-7-provision.sh
+++ b/vagrant/centos-7-provision.sh
@@ -15,7 +15,7 @@ yum update -y
 yum install -y epel-release
 
 yum install -y postgresql-server postgresql-contrib postgresql-devel postgis postgis-utils \
 yum install -y epel-release
 
 yum install -y postgresql-server postgresql-contrib postgresql-devel postgis postgis-utils \

-               make automake gcc gcc-c++ libtool policycoreutils-python \
+               make cmake gcc gcc-c++ libtool policycoreutils-python \

                php-pgsql php php-pear php-pear-DB libpqxx-devel proj-epsg \
                bzip2-devel proj-devel geos-devel libxml2-devel boost-devel \
                expat-devel zlib-devel
                php-pgsql php php-pear php-pear-DB libpqxx-devel proj-epsg \
                bzip2-devel proj-devel geos-devel libxml2-devel boost-devel \
                expat-devel zlib-devel


@@ -70,13 +70,14 @@ cd /home/$USERNAME
 # If the Nominatim source is not being shared with the host, check out source.
 if [ ! -d "Nominatim" ]; then
   yum install -y git
 # If the Nominatim source is not being shared with the host, check out source.
 if [ ! -d "Nominatim" ]; then
   yum install -y git

-  sudo -u $USERNAME git clone --recursive https://github.com/twain47/Nominatim.git
+  sudo -H -u $USERNAME git clone --recursive https://github.com/twain47/Nominatim.git

 fi
 
 # Configure and compile the source.
 cd Nominatim
 fi
 
 # Configure and compile the source.
 cd Nominatim

-sudo -u $USERNAME ./autogen.sh
-sudo -u $USERNAME ./configure
+sudu -u $USERNAME mkdir build-vagrant
+cd build-vagrant
+sudo -u $USERNAME cmake ..

 sudo -u $USERNAME make
 
 # Make sure that postgres has access to the nominatim library.
 sudo -u $USERNAME make
 
 # Make sure that postgres has access to the nominatim library.