diff --git a/Makefile b/Makefile index 1a188635..1ea015aa 100644 --- a/Makefile +++ b/Makefile @@ -58,7 +58,7 @@ zips/packages/Natural_Earth_quick_start.zip: \ cp README.md packages/Natural_Earth_quick_start/README.md cp VERSION packages/Natural_Earth_quick_start/VERSION - rm $@ + rm -f $@ zip -r $@ packages/Natural_Earth_quick_start/ cp $@ archive/Natural_Earth_quick_start_$(VERSION).zip @@ -690,7 +690,7 @@ zips/10m_cultural/ne_10m_parks_and_protected_lands.zip: \ curl http://www.naturalearthdata.com/downloads/10m-cultural-vectors/parks-and-protected-lands/ > 10m_cultural/ne_10m_parks_and_protected_lands_point.README.html zip -j -r $@ 10m_cultural/ne_10m_parks_and_protected_lands*.* cp $@ archive/ne_10m_parks_and_protected_lands$(VERSION_PREFIXED).zip - rm geojson/ne_10m_parks_and_protected_lands_*.geojson + rm -f geojson/ne_10m_parks_and_protected_lands_*.geojson ogr2ogr -overwrite -f GeoJSON -lco WINDOWS-1252 geojson/ne_10m_parks_and_protected_lands_area.geojson 10m_cultural/ne_10m_parks_and_protected_lands_area.shp ogr2ogr -overwrite -f GeoJSON -lco WINDOWS-1252 geojson/ne_10m_parks_and_protected_lands_scale_rank.geojson 10m_cultural/ne_10m_parks_and_protected_lands_scale_rank.shp ogr2ogr -overwrite -f GeoJSON -lco WINDOWS-1252 geojson/ne_10m_parks_and_protected_lands_line.geojson 10m_cultural/ne_10m_parks_and_protected_lands_line.shp @@ -2082,4 +2082,4 @@ clean: rm -rf zips/50m_physical/* rm -rf zips/110m_cultural/* rm -rf zips/110m_physical/* - #rm -rf zips/packages/* \ No newline at end of file + #rm -rf zips/packages/* diff --git a/UPDATE_PROCEDURE.md b/UPDATE_PROCEDURE.md index b0147f94..a17babe1 100644 --- a/UPDATE_PROCEDURE.md +++ b/UPDATE_PROCEDURE.md @@ -2,8 +2,11 @@ Scripts to build Natural Earth ZIP archives for individual themes, scalesets, and packagages. -**Requirements**: `Make` a generic Unix utility, to be installed. +**Requirements**: + - `Make` a generic Unix utility, to be installed. + - `GDAL` to be installed and the folder containing ogr2ogr to be added to the PATH environment variable + Assumed to be run on Mac or Ubuntu Linux. #Usage @@ -39,6 +42,12 @@ also be recorded, with better formatting, in a public blog post. make zips/packages/Natural_Earth_quick_start/Natural_Earth_quick_start.zip make clean + Note, that if this is a clean clone or checkout you should + start with the following, since 'clean' creates the required + empty directories: + + make clean all + 6. Push those changes live to the distribution network! make live