Merge remote-tracking branch 'upstream/master' into cmake-port

[nominatim.git] / VAGRANT.md

diff --git a/VAGRANT.md b/VAGRANT.md
index e6a0fbb371c66f787a45c18c239f4a5ced60d320..cd3ed311f01443bfb3987f94339cf052e4075bf7 100644 (file)
--- a/VAGRANT.md
+++ b/VAGRANT.md
@@ -45,11 +45,12 @@ is.
 
   ```
   # inside the virtual machine:
 
   ```
   # inside the virtual machine:

-  cd Nominatim
-    wget --no-verbose --output-document=data/monaco.osm.pbf http://download.geofabrik.de/europe/monaco-latest.osm.pbf
-    ./utils/setup.php --osm-file data/monaco.osm.pbf --osm2pgsql-cache 1000 --all 2>&1 | tee monaco.$$.log
-    ./utils/specialphrases.php --countries > data/specialphrases_countries.sql
-    psql -d nominatim -f data/specialphrases_countries.sql
+  mkdir data
+  cd build
+    wget --no-verbose --output-document=../data/monaco.osm.pbf http://download.geofabrik.de/europe/monaco-latest.osm.pbf
+    ./utils/setup.php --osm-file ../data/monaco.osm.pbf --osm2pgsql-cache 1000 --all 2>&1 | tee monaco.$$.log
+    ./utils/specialphrases.php --countries > ../data/specialphrases_countries.sql
+    psql -d nominatim -f ../data/specialphrases_countries.sql

     ```
 
   To repeat an import you'd need to delete the database first
     ```
 
   To repeat an import you'd need to delete the database first