version 2.0-6

cran · Oct 29, 2003 · b180734 · b180734
1 parent 852698f
commit b180734
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 11 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,11 +1,11 @@
 Package: mapdata
-Version: 2.0-5
-Date: 2003-10-09
+Version: 2.0-6
+Date: 2003-10-29
 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>
 Maintainer: Ray Brownrigg <ray@mcs.vuw.ac.nz>
-Depends: R (>= 1.7.0), maps (>= 2.0-1)
+Depends: R (>= 1.7.0), maps (>= 2.0-7)
 Description: Supplement to maps package, providing the larger and/or
 	higher-resolution databases.
 License: GPL2
diff --git a/data/00Index b/data/00Index
diff --git a/man/worldHires.Rd b/man/worldHires.Rd
@@ -33,7 +33,7 @@ The CIA World Data Bank II is currently (mid-2003) available from
 \code{\link[maps]{map}}, \code{\link[maps]{world}}
 }
 \examples{
-map('worldHires', fill=TRUE, col=1:10)
+map('worldHires', col=1:10)
 map('worldHires', 'Switzerland')
 title('Switzerland')
 }

diff --git a/src/Gmake.c b/src/Gmake.c
@@ -1,5 +1,6 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <float.h>
 #include "map.h"
 

diff --git a/src/Lmake.c b/src/Lmake.c
@@ -1,5 +1,6 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <float.h>
 #include "map.h"
 

diff --git a/src/Makefile b/src/Makefile
@@ -34,4 +34,4 @@ world2Hires.n: worldHires.n
 	$(CP) ${*}.n ../inst/mapdata/${*}.N
 
 clean:
-	$(RM) Gmake Lmake ../inst/mapdata/* world2Hires.*
+	$(RM) -f Gmake Lmake ../inst/mapdata/* world2Hires.*
diff --git a/src/Makefile.win b/src/Makefile.win
@@ -3,11 +3,13 @@ include $(RHOME)/src/gnuwin32/MkRules
 
 .SUFFIXES: .G .L .N .gon .line .n
 
+CFLAGS = -I$(RHOME)/src/include -Wall -pedantic -O2 -DWin32
+
 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) $(NDATA) instdata
 
 ifeq ($(strip $(BUILD)),CROSS)
 Gmake:
@@ -40,5 +42,9 @@ world2Hires.gon: worldHires.gon
 world2Hires.n: worldHires.n
 	$(CP) worldHires.n world2Hires.n	# .. since this doesn't
 
+instdata:
+	@$(ECHO) "copying new inst files"
+	$(CP) -r ../inst/* $(RLIB)/$(PKG)
+
 clean:
 	$(RM) Gmake.exe Lmake.exe ../inst/mapdata/* world2Hires.*