Need to link to installed news file for static help.

git-svn-id: https://svn.r-project.org/R/trunk@87336 00db46b3-68df-0310-9c12-caf00c1e9a41

Author: hornik

src/library/tools/R/dynamicHelp.R

@@ -390,7 +390,7 @@ httpd <- function(path, query, ...)
     demosRegexp <- "^/library/([^/]*)/demo/([^/]*)$"
     DemoRegexp <- "^/library/([^/]*)/Demo/([^/]*)$"
     ExampleRegexp <- "^/library/([^/]*)/Example/([^/]*)$"
-    newsRegexp <- "^/library/([^/]*)/NEWS$"
+    newsRegexp <- "^/library/([^/]*)/NEWS([.](Rd|md))?$"
     figureRegexp <- "^/library/([^/]*)/(help|html)/figures/([^/]*)$"
     sessionRegexp <- "^/session/"
     packageIndexRegexp <- "^/library/([^/]*)$"

src/library/tools/R/install.R

@@ -2859,12 +2859,14 @@ if(FALSE) {
 	    cat('<li><a href="../doc/index.html">User guides, package vignettes and other documentation.</a></li>\n', file=conn)
 	if (file.exists(file.path(outDir, "demo")))
 	    cat('<li><a href="../demo">Code demos</a>.  Use <a href="../../utils/help/demo">demo()</a> to run them.</li>\n',
-		 sep = "", file=conn)
-	if (any(file.exists(file.path(outDir,
-                                      c("NEWS", "NEWS.Rd", "NEWS.md")))))
-	    ## FIXME: link target needs adjustment for static help
-	    cat('<li><a href="../NEWS">Package NEWS</a>.</li>\n',
-		 sep = "", file=conn)
+                sep = "", file=conn)
+        for(nfile in c("NEWS", "NEWS.Rd", "NEWS.md")) {
+            if(file.exists(file.path(outDir, nfile))) {
+                cat('<li><a href="../', nfile, '">Package NEWS</a>.</li>\n',
+                    sep = "", file=conn)
+                break
+            }
+        }
 
         cat('</ul>\n\n<h2>Help Pages</h2>\n\n\n',
             sep ="", file = conn)