X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=makefile;h=155910a68c03a8598a64c5d987999dadca886fb8;hb=0e8428f00f565a3e1791e19098ab59442972fa09;hp=7b0c37511549e24794729402932d5356d624d3a3;hpb=34232f7bd4ad9b4c4d234b91c55a9dc2b1b9d6f7;p=dead%2Fcensus-tools.git

diff --git a/makefile b/makefile
index 7b0c375..155910a 100644
--- a/makefile
+++ b/makefile
@@ -1,6 +1,6 @@
 DB_NAME='census'
 DB_USER='postgres'
-TIGER_DATA_URL='http://www2.census.gov/cgi-bin/shapefiles/multi-file-download?files=24_MARYLAND%2Ftl_2008_24_tabblock00.zip'
+TIGER_DATA_URL='http://www2.census.gov/geo/tiger/TIGER2009/24_MARYLAND/tl_2009_24_tabblock00.zip'
 TIGER_SRID='4269'
 
 # Starting with PostGIS 1.4.0, these paths are calculated at install
@@ -35,14 +35,11 @@ clean:
 # data, so the filenames are hard-coded. Easy enough to change.
 #
 data:
-	mkdir -p data/census-2000-block/maryland/
-	if [ ! -f data/census-2000-block/maryland/tl_2008_24_tabblock00.shp ]; then \
-		wget -O tiger.zip $(TIGER_DATA_URL); \
-		unzip tiger.zip; \
-		rm tiger.zip; \
-		unzip srv/ftp/geo/tiger/TIGER2008/24_MARYLAND/tl_2008_24_tabblock00.zip \
-                      -d ./data/census-2000-block/maryland/; \
-		rm -rf srv; \
+	mkdir -p data/census2000/maryland/block
+	if [ ! -f data/census2000/maryland/block/tl_2009_24_tabblock00.shp ]; then \
+		wget -O tmp.zip $(TIGER_DATA_URL); \
+		unzip tmp.zip -d ./data/census2000/maryland/block; \
+		rm tmp.zip; \
 	fi;
 
 
@@ -64,7 +61,8 @@ data:
 # of the sf1blocks2sql script.
 #
 db: data
-	dropdb -U $(DB_USER) $(DB_NAME)
+	# Ignore the result of dropdb when it fails.
+	dropdb -U $(DB_USER) $(DB_NAME) || true
 	createdb -U $(DB_USER) $(DB_NAME)
 	createlang -U $(DB_USER) plpgsql $(DB_NAME)
 
@@ -78,8 +76,8 @@ db: data
 
 	$(PG_BINDIR)/shp2pgsql -I                                           \
 		  -s $(TIGER_SRID)                                          \
-	          data/census-2000-block/maryland/tl_2008_24_tabblock00.shp \
-	          tiger                                                     \
+	          data/census2000/maryland/block/tl_2009_24_tabblock00.shp  \
+	          tiger_blocks                                              \
                   | psql -U $(DB_USER) -d $(DB_NAME)
 
 	psql -d $(DB_NAME) \