Merge remote-tracking branch 'upstream/master'

[nominatim.git] / vagrant / install-on-travis-ci.sh

diff --git a/vagrant/install-on-travis-ci.sh b/vagrant/install-on-travis-ci.sh
index b2d9a326de5ddccc1051d871c9fe8fa880ac515c..983571856e07c8469034a246dc15167cb260f7b5 100755 (executable)
--- a/vagrant/install-on-travis-ci.sh
+++ b/vagrant/install-on-travis-ci.sh
@@ -16,7 +16,7 @@ sudo apt-get install -y -qq libboost-dev libboost-system-dev \
                             libboost-filesystem-dev libexpat1-dev zlib1g-dev libxml2-dev\
                             libbz2-dev libpq-dev libgeos-c1 libgeos++-dev libproj-dev \
                             postgresql-server-dev-9.6 postgresql-9.6-postgis-2.3 postgresql-contrib-9.6 \
                             libboost-filesystem-dev libexpat1-dev zlib1g-dev libxml2-dev\
                             libbz2-dev libpq-dev libgeos-c1 libgeos++-dev libproj-dev \
                             postgresql-server-dev-9.6 postgresql-9.6-postgis-2.3 postgresql-contrib-9.6 \

-                            apache2 php5 php5-pgsql php-pear php-db php-intl
+                            apache2 php5 php5-pgsql php-pear php-db php5-intl

 
 sudo apt-get install -y -qq python3-dev python3-pip python3-psycopg2 phpunit php5-cgi
 
 
 sudo apt-get install -y -qq python3-dev python3-pip python3-psycopg2 phpunit php5-cgi
 


@@ -45,7 +45,7 @@ EOFAPACHECONF
 sudo a2enconf nominatim
 sudo service apache2 restart
 
 sudo a2enconf nominatim
 sudo service apache2 restart
 

-wget -O data/country_osm_grid.sql.gz http://www.nominatim.org/data/country_grid.sql.gz
+wget -O $TRAVIS_BUILD_DIR/data/country_osm_grid.sql.gz http://www.nominatim.org/data/country_grid.sql.gz

 
 mkdir build
 cd build
 
 mkdir build
 cd build