Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

tidy up the installation of pkg datasets

git-svn-id: https://svn.r-project.org/R/trunk@56459 00db46b3-68df-0310-9c12-caf00c1e9a41
  • Loading branch information...
commit 325c8172bcbb3fb034f77e5f8967ddafa83932bf 1 parent e6643d4
ripley authored
Showing with 4 additions and 23 deletions.
  1. +2 −22 share/make/basepkg.mk
  2. +2 −1  src/library/datasets/Makefile.win
View
24 share/make/basepkg.mk
@@ -20,28 +20,7 @@ instdirs:
done; \
fi; done
-## used for datasets
-mkR:
- @$(MKINSTALLDIRS) $(top_builddir)/library/$(pkg)/R
- @(f=$${TMPDIR:-/tmp}/R$$$$; \
- if test "$(R_KEEP_PKG_SOURCE)" = "yes"; then \
- $(ECHO) > "$${f}"; \
- for rsrc in $(RSRC); do \
- $(ECHO) "#line 1 \"$${rsrc}\"" >> "$${f}"; \
- cat $${rsrc} >> "$${f}"; \
- done; \
- else \
- cat $(RSRC) > "$${f}"; \
- fi; \
- $(SHELL) $(top_srcdir)/tools/move-if-change "$${f}" all.R)
- @$(SHELL) $(top_srcdir)/tools/copy-if-change all.R \
- $(top_builddir)/library/$(pkg)/R/$(pkg)
- @if test -f $(srcdir)/NAMESPACE; then \
- $(INSTALL_DATA) $(srcdir)/NAMESPACE $(top_builddir)/library/$(pkg); \
- fi
- @rm -f $(top_builddir)/library/$(pkg)/Meta/nsInfo.rds
-
-## do not install all.R
+## does not install all.R
mkR1:
@$(MKINSTALLDIRS) $(top_builddir)/library/$(pkg)/R
@(f=$${TMPDIR:-/tmp}/R$$$$; \
@@ -80,6 +59,7 @@ mkR2:
@rm -f $(top_builddir)/library/$(pkg)/Meta/nsInfo.rds
## version for base on Unix, substitutes for @which@
+## (and so cannot be in src/library/base/Makefile.in)
mkRbase:
@$(MKINSTALLDIRS) $(top_builddir)/library/$(pkg)/R
@(f=$${TMPDIR:-/tmp}/R$$$$; \
View
3  src/library/datasets/Makefile.win
@@ -16,7 +16,8 @@ RSRC = $(srcdir)/R/zzz.R
all:
@$(ECHO) "building package '$(pkg)'"
@$(MKINSTALLDIRS) $(top_builddir)/library/$(pkg)
- @$(MAKE) -f Makefile.win mkR mkdesc
+ @$(MAKE) -f Makefile.win mkR1 mkdesc
+ @$(INSTALL_DATA) all.R $(top_builddir)/library/$(pkg)/R/$(pkg)
@$(MKINSTALLDIRS) $(top_builddir)/library/$(pkg)/data
@for f in $(srcdir)/data/*; do \
$(INSTALL_DATA) $${f} $(top_builddir)/library/$(pkg)/data; \
Please sign in to comment.
Something went wrong with that request. Please try again.