Skip to content

Commit 680fa55

Browse files
author
hornik
committed
Move wre.txt to misc subdir.
git-svn-id: https://svn.r-project.org/R/trunk@89129 00db46b3-68df-0310-9c12-caf00c1e9a41
1 parent 2246ebb commit 680fa55

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

src/library/tools/Makefile.in

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ DISTFILES = DESCRIPTION.in Makefile.in Makefile.win NAMESPACE
1515

1616
pkg = tools
1717

18-
WRE_DATA = $(top_builddir)/library/$(pkg)/wre.txt
18+
WRE_DATA = $(top_builddir)/library/$(pkg)/misc/wre.txt
1919
WRE_SRC = $(top_srcdir)/doc/manual/R-exts.texi
2020

2121
RSRC = `LC_COLLATE=C ls $(srcdir)/R/*.R`
@@ -33,6 +33,7 @@ update:
3333
all: Makefile DESCRIPTION
3434
@$(ECHO) "building package '$(pkg)'"
3535
@$(MKINSTALLDIRS) $(top_builddir)/library/$(pkg)
36+
@$(MKINSTALLDIRS) $(top_builddir)/library/$(pkg)/misc
3637
@$(MAKE) mkR1 mkdesc2 $(WRE_DATA)
3738
@$(MAKE) mksrc
3839
@if ! test -f $(top_builddir)/library/$(pkg)/R/$(pkg); then \

src/library/tools/R/apitools.R

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@
2020
## Work out the function API from information in WRE
2121
##
2222

23-
## WRE data is now installed in system.file(package = "tools", "wre.txt")
23+
## WRE data is now installed in
24+
## system.file(package = "tools", "misc", "wre.txt")
2425
## WRE(newpath) forces a new load with the new path.
2526

2627
apidata <-
@@ -42,7 +43,8 @@ resetAPI <- function(newloc = "") {
4243
WRE <- function() {
4344
if (is.null(apidata$wrelines)) {
4445
if (is.null(apidata$wreloc)) {
45-
apidata$wreloc <- system.file(package = "tools", "wre.txt")
46+
apidata$wreloc <-
47+
system.file(package = "tools", "misc", "wre.txt")
4648
if (apidata$wreloc == "")
4749
apidata$wreloc <-
4850
"https://svn.r-project.org/R/trunk/doc/manual/R-exts.texi"

0 commit comments

Comments
 (0)