mirror of
https://github.com/oDinZu/natural-earth-vector.git
synced 2025-02-22 00:04:57 -05:00
Issue-132 Add '-f' to all 'rm' occurences
Make would fail if an attempte was made to remove a file that did no exist. Adding '-f' to ensure it continues even if the file does not exist.
This commit is contained in:
parent
3645ba3644
commit
60b0ccd1fb
6
Makefile
6
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/*
|
||||
#rm -rf zips/packages/*
|
||||
|
Loading…
x
Reference in New Issue
Block a user