version 2.0-7

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: mapdata
-Version: 2.0-6
-Date: 2003-10-29
+Version: 2.0-7
+Date: 2003-11-06
 Title: Extra Map Databases
 Author: Original S code by Richard A. Becker and Allan R. Wilks.
 	R version by Ray Brownrigg <ray@mcs.vuw.ac.nz>

src/Makefile

@@ -8,9 +8,15 @@ ECHO = echo
 
 GDATA = china.G nzHires.G rivers.G worldHires.G world2Hires.G
 LDATA = china.L nzHires.L rivers.L worldHires.L world2Hires.L
-NDATA = china.N nzHires.N rivers.N worldHires.N world2Hires.N
 
-all: Gmake Lmake $(LDATA) $(GDATA) $(NDATA)
+all: Gmake Lmake $(LDATA) $(GDATA)
+
+.line.L:
+	./Lmake 0 s b ${*}.line ${*}.linestats ../inst/mapdata/${*}.L
+
+.gon.G:
+	./Gmake b ${*}.gon ${*}.gonstats ../inst/mapdata/${*}.G ../inst/mapdata/${*}.L
+	$(CP) ${*}.n ../inst/mapdata/${*}.N	# needed here for Mac
 
 world2Hires.line: worldHires.line
 	@$(ECHO) "Converting world to world2"
@@ -20,18 +26,7 @@ world2Hires.line: worldHires.line
 world2Hires.gon: worldHires.gon
 	$(CP) worldHires.gon world2Hires.gon
 	$(CP) worldHires.gonstats world2Hires.gonstats
-
-world2Hires.n: worldHires.n
 	$(CP) worldHires.n world2Hires.n
 
-.line.L:
-	./Lmake 0 s b ${*}.line ${*}.linestats ../inst/mapdata/${*}.L
-
-.gon.G:
-	./Gmake b ${*}.gon ${*}.gonstats ../inst/mapdata/${*}.G ../inst/mapdata/${*}.L
-
-.n.N:
-	$(CP) ${*}.n ../inst/mapdata/${*}.N
-
 clean:
 	$(RM) -f Gmake Lmake ../inst/mapdata/* world2Hires.*