[r-cran-maps] 31/64: Import Upstream version 2.1-4

[Andreas Tille]

This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository r-cran-maps.

commit b69170b53d000034cbce3a8ba7fa8fa947b480a9
Author: Andreas Tille <tille at debian.org>
Date:   Thu Sep 7 09:26:45 2017 +0200

    Import Upstream version 2.1-4
---
 DESCRIPTION      | 10 +++++-----
 src/Makefile     |  8 ++++++--
 src/Makefile.win | 30 +++++++++++-------------------
 3 files changed, 22 insertions(+), 26 deletions(-)

diff --git a/DESCRIPTION b/DESCRIPTION
index 383fac3..689915c 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,17 +1,17 @@
 Package: maps
 Title: Draw Geographical Maps
-Version: 2.1-3
-Date: 2010-05-17
+Version: 2.1-4
+Date: 2010-05-25
 Author: Original S code by Richard A. Becker and Allan R. Wilks. R
         version by Ray Brownrigg <Ray.Brownrigg at ecs.vuw.ac.nz>
         Enhancements by Thomas P Minka <surname at stat.cmu.edu>
 Description: Display of maps.  Projection code and larger maps are in
         separate packages (mapproj and mapdata).
-Depends: R (>= 2.7.0)
+Depends: R (>= 2.9.0)
 LazyLoad: yes
 Suggests: mapproj
 License: GPL-2
 Maintainer: Ray Brownrigg <Ray.Brownrigg at ecs.vuw.ac.nz>
-Packaged: 2010-05-17 01:47:32 UTC; ray
+Packaged: 2010-05-25 03:23:08 UTC; ray
 Repository: CRAN
-Date/Publication: 2010-05-17 09:00:05
+Date/Publication: 2010-05-25 17:09:05
diff --git a/src/Makefile b/src/Makefile
index 02b5493..4cb14fb 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -4,7 +4,8 @@
 PKGNAME = maps
 CP = cp
 ECHO = echo
-RM = rm
+RM = rm -f
+MKDIR = mkdir
 
 OBJS = mapget.o		\
 	smooth.o	\
@@ -15,12 +16,14 @@ LDATA = county.L state.L usa.L nz.L world.L world2.L italy.L france.L
 NDATA = county.N state.N usa.N nz.N world.N world2.N italy.N france.N
 
 .line.L:
+	@$(MKDIR) -p ../inst/mapdata
 	./Lmake 0 s b ${*}.line ${*}.linestats ../inst/mapdata/${*}.L
 
 .gon.G:
 	./Gmake b ${*}.gon ${*}.gonstats ../inst/mapdata/${*}.G ../inst/mapdata/${*}.L
 
 .name.N:
+	@$(MKDIR) -p ../inst/mapdata
 	@$(CP) ${*}.name ../inst/mapdata/${*}.N
 
 .PHONY: all gdata ldata ndata
@@ -48,4 +51,5 @@ world2.line: world.line
 	@$(CP) world.name world2.name
 
 clean:
-	$(RM) -f $(OBJS) Gmake Lmake ../inst/mapdata/* world2.* $(PKGNAME).s[lo] $(PKGNAME).dylib
+	$(RM) $(OBJS) Gmake Lmake world2.* $(PKGNAME).s[lo] $(PKGNAME).dylib
+	$(RM) -r ../inst
diff --git a/src/Makefile.win b/src/Makefile.win
index 9450b71..83b4fe8 100644
--- a/src/Makefile.win
+++ b/src/Makefile.win
@@ -1,16 +1,14 @@
 #-*- Makefile -*-
 
-## this needs a *source* build of R
-## RHOME is obsolete, but still set
-include $(RHOME)/src/gnuwin32/MkRules
+include $(R_HOME)/etc$(R_ARCH)/Makeconf
 
 .SUFFIXES: .G .L .N .gon .line .name
 
 DLLNAME = maps
 
-CFLAGS = -I$(RHOME)/include -Wall -pedantic -O2 -DWin32
+CFLAGS = -I$(R_HOME)/include -Wall -pedantic -O2 -DWin32
 
-DLLLIBS = -L$(RHOME)/bin -lR 
+DLLLIBS = -L$(IMPDIR) -lR
 
 OBJS = mapget.o		\
 	smooth.o	\
@@ -21,25 +19,19 @@ LDATA = county.L state.L usa.L nz.L world.L world2.L italy.L france.L
 NDATA = county.N state.N usa.N nz.N world.N world2.N italy.N france.N
 
 .line.L:
+	@$(MKDIR) -p ../inst/mapdata
 	./Lmake 0 s b ${*}.line ${*}.linestats ../inst/mapdata/${*}.L
 
 .gon.G:
 	./Gmake b ${*}.gon ${*}.gonstats ../inst/mapdata/${*}.G ../inst/mapdata/${*}.L
 
 .name.N:
+	@$(MKDIR) -p ../inst/mapdata
 	@$(CP) ${*}.name ../inst/mapdata/${*}.N
 
-ifeq ($(strip $(BUILD)),CROSS)
-Gmake:
-	$(MAKE) CC=gcc Gmake
-
-Lmake:
-	$(MAKE) CC=gcc Lmake
-endif
-
 .PHONY: all gdata ldata ndata
 
-all: ../libs/$(DLLNAME).dll ldata gdata ndata
+all: ../libs$(R_ARCH)/$(DLLNAME).dll ldata gdata ndata
 
 gdata: Gmake ldata
 	$(MAKE) -f Makefile.win $(GDATA)
@@ -52,11 +44,11 @@ ndata: world2.line
 
 $(DLLNAME).dll: $(OBJS) 
 
-../libs/$(DLLNAME).dll: ../libs $(DLLNAME).dll
+../libs$(R_ARCH)/$(DLLNAME).dll: ../libs$(R_ARCH) $(DLLNAME).dll
 	$(CP) $(DLLNAME).dll $@
 
-../libs:
-	$(MKDIR) $@
+../libs$(R_ARCH):
+	$(MKDIR) -p $@
 
 world2.line: world.line
 	@$(ECHO) "Converting world to world2"
@@ -67,5 +59,5 @@ world2.line: world.line
 	@$(CP) world.name world2.name
 
 clean:
-	$(RM) -f $(DLLNAME).dll *.a $(OBJS) *.rc Gmake.exe Lmake.exe ../inst/mapdata/* ../libs/$(DLLNAME).dll world2.*
-	$(RM) -r ../libs
+	$(RM) $(DLLNAME).dll *.a $(OBJS) *.rc Gmake.exe Lmake.exe ../libs$(R_ARCH)/$(DLLNAME).dll world2.*
+	$(RM) -r ../libs$(R_ARCH) ../inst

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/r-cran-maps.git