diff --git a/Makefile b/Makefile index 7b132754..6af9d9d7 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,8 @@ VERSION:=$(shell cat VERSION) -PACKAGE=NaturalEarth-vector-$(VERSION) -TARBALL=$(PACKAGE).tar.gz -DOCROOT=naturalearthdata.com:public_html/www +#PACKAGE=NaturalEarth-vector-$(VERSION) +#TARBALL=$(PACKAGE).tar.gz +DOCROOT_NE=ftp://naturalearthdata.com//download/ +DOCROOT_FREAC=ftp://ftp.freac.fsu.edu//web-download/ all: zips @@ -36,7 +37,6 @@ zips/packages/Natural_Earth_quick_start/Natural_Earth_quick_start.zip: \ cp zips/packages/Natural_Earth_quick_start.zip zips/packages/Natural_Earth_quick_start_$(VERSION).zip - # PER THEME, BY SCALESET # SCALESET ZIPS by zoom and physical, cultural (6 total) @@ -778,17 +778,37 @@ live: zips # NATURALEARTHDATA.com copy #special items: scp updates/natural_earth_update_$(VERSION).zip naturbb6@naturalearthdata.com:download/updates/natural_earth_update_$(VERSION).zip - scp packages/natural_earth_update_$(VERSION).zip naturbb6@naturalearthdata.com:download/packages/natural_earth_update_$(VERSION).zip + # packages + rsync -Cr zips/packages/ $(DOCROOT_NE)/packages/ # etc for each theme - scp ne_10m_admin_0_countries.zip naturbb6@naturalearthdata.com:download/10m/cultural/10m-admin-0-countries.zip + rsync -Cr zips/10m_cultural/ $(DOCROOT_NE)/10m/cultural/ + rsync -Cr zips/10m_physical/ $(DOCROOT_NE)/10m/physical/ + rsync -Cr zips/50m_cultural/ $(DOCROOT_NE)/50m/cultural/ + rsync -Cr zips/50m_physical/ $(DOCROOT_NE)/50m/physical/ + rsync -Cr zips/110m_cultural/ $(DOCROOT_NE)/110m/cultural/ + rsync -Cr zips/110m_physical/ $(DOCROOT_NE)/110m/physical/ # FREAC copy #special items: scp updates/natural_earth_update_$(VERSION).zip nacis@ftp.freac.fsu.edu:nacis_ftp/web-download/updates/natural_earth_update_$(VERSION).zip - scp packages/natural_earth_update_$(VERSION).zip nacis@ftp.freac.fsu.edu:nacis_ftp/web-download/packages/natural_earth_update_$(VERSION).zip + # packages + rsync -Cr zips/packages/ $(DOCROOT_NE)/packages/ # etc for each theme - scp ne_10m_admin_0_countries.zip nacis@ftp.freac.fsu.edu:nacis_ftp/web-download/10m/cultural/10m-admin-0-countries.zip + rsync -Cr zips/10m_cultural/ $(DOCROOT_FREAC)/10m/cultural/ + rsync -Cr zips/10m_physical/ $(DOCROOT_FREAC)/10m/physical/ + rsync -Cr zips/50m_cultural/ $(DOCROOT_FREAC)/50m/cultural/ + rsync -Cr zips/50m_physical/ $(DOCROOT_FREAC)/50m/physical/ + rsync -Cr zips/110m_cultural/ $(DOCROOT_FREAC)/110m/cultural/ + rsync -Cr zips/110m_physical/ $(DOCROOT_FREAC)/110m/physical/ +clean-quick-start: + rm -rf packages/Natural_Earth_quick_start/10m_cultural/* + rm -rf packages/Natural_Earth_quick_start/10m_physical/* + rm -rf packages/Natural_Earth_quick_start/50m_raster/* + rm -rf packages/Natural_Earth_quick_start/110m_cultural/* + rm -rf packages/Natural_Earth_quick_start/110m_physical/* + + clean: mkdir -p zips/10m_cultural mkdir -p zips/10m_physical @@ -803,9 +823,4 @@ clean: rm -rf zips/50m_physical/* rm -rf zips/110m_cultural/* rm -rf zips/110m_physical/* - rm -rf zips/packages/* - rm -rf packages/Natural_Earth_quick_start/10m_cultural/* - rm -rf packages/Natural_Earth_quick_start/10m_physical/* - rm -rf packages/Natural_Earth_quick_start/50m_raster/* - rm -rf packages/Natural_Earth_quick_start/110m_cultural/* - rm -rf packages/Natural_Earth_quick_start/110m_physical/* \ No newline at end of file + rm -rf zips/packages/* \ No newline at end of file