Permalink
Browse files

move some files from SVN sources to `make dist'.

reorganize a bit how .html doc files are used.
copy a few recent changes from R-patched.


git-svn-id: https://svn.r-project.org/R/trunk@31424 00db46b3-68df-0310-9c12-caf00c1e9a41
  • Loading branch information...
1 parent a711747 commit 0f0950cae845c4abddcb023462155c5b2dab9330 ripley committed Oct 15, 2004
Showing with 110 additions and 26,339 deletions.
  1. +0 −4,350 FAQ
  2. +27 −5 Makefile.in
  3. +15 −1 NEWS
  4. +0 −50 RESOURCES
  5. +0 −8,824 acinclude.m4
  6. +0 −8,410 aclocal.m4
  7. +24 −7 doc/Makefile.in
  8. +0 −189 doc/R.1
  9. +26 −8 doc/html/Makefile.in
  10. +0 −4,363 doc/html/faq.html
  11. +1 −1 doc/html/index-default.html
  12. +0 −94 doc/html/resources.html
  13. +16 −31 doc/manual/Makefile.in
  14. +1 −1 src/library/Recommended/Makefile.in
  15. +0 −5 tools/link-recommended
View
4,350 FAQ
0 additions, 4,350 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
32 Makefile.in
@@ -10,7 +10,8 @@ top_builddir = .
include $(top_builddir)/Makeconf
distdir = $(PACKAGE)-$(VERSION)
-INSTFILES = AUTHORS COPYING COPYING.LIB COPYRIGHTS FAQ NEWS RESOURCES THANKS
+INSTFILES = AUTHORS COPYING COPYING.LIB COPYRIGHTS NEWS THANKS
+NON_SVN_INSTFILES = FAQ RESOURCES
DISTFILES = $(INSTFILES) \
ChangeLog INSTALL ONEWS README VERSION Y2K \
Makeconf.in Makefile.in \
@@ -50,7 +51,7 @@ LIBTOOL_DEPS = @LIBTOOL_DEPS@
libtool: $(LIBTOOL_DEPS)
$(SHELL) ./config.status --recheck
-R: Makefile
+R: Makefile svnonly
@if test "$(BUILDDIR_IS_SRCDIR)" = no ; then \
for f in $(INSTFILES); do \
$(INSTALL_DATA) $(srcdir)/$${f} $(top_builddir); \
@@ -75,13 +76,16 @@ stamp-recommended: R docs
vignettes: stamp-recommended
-@(cd src/library && $(MAKE) $@)
-install: installdirs
+install: installdirs svnonly
@for d in $(SUBDIRS); do \
(cd $${d} && $(MAKE) $@) || exit 1; \
done
@for f in $(INSTFILES); do \
$(INSTALL_DATA) $(srcdir)/$${f} "$(rhome)"; \
done
+ @for f in $(NON_SVN_INSTFILES); do \
+ $(INSTALL_DATA) $${f} "$(rhome)"; \
+ done
@WANT_R_FRAMEWORK_TRUE@ $(MAKE) install-R-framework
@WANT_R_FRAMEWORK_TRUE@ @(sed 's/^LIBR =.*/LIBR = -framework R/' \
@WANT_R_FRAMEWORK_TRUE@ $(top_builddir)/etc/Makeconf > "$(rhome)/etc/Makeconf")
@@ -92,6 +96,17 @@ install: installdirs
@WANT_R_FRAMEWORK_TRUE@ @(chmod 755 $(R_FRAMEWORK_DIR)/Resources/bin/R)
@WANT_R_FRAMEWORK_TRUE@ @(cp $(R_FRAMEWORK_DIR)/Resources/bin/R $(R_FRAMEWORK_DIR)/Resources/R)
+svnonly:
+ @if test ! -f "$(srcdir)/FAQ" ; then \
+ cd doc/manual && $(MAKE) front-matter ; \
+ touch non-tarball ; \
+ else \
+ if test "$(BUILDDIR_IS_SRCDIR)" = no ; then \
+ for f in $(NON_SVN_INSTFILES); do \
+ $(INSTALL_DATA) $(srcdir)/$${f} "$(rhome)/$(subdir)"; \
+ done \
+ fi \
+ fi
installdirs:
@$(MKINSTALLDIRS) "$(rhome)"
@@ -113,15 +128,18 @@ clean:
@(for d in $(SUBDIRS); do rsd="$${d} $${rsd}"; done; \
for d in $${rsd}; do (cd $${d} && $(MAKE) $@); done)
@if test "$(BUILDDIR_IS_SRCDIR)" = no ; then \
- rm -f $(INSTFILES); \
+ rm -f $(INSTFILES) $(NON_SVN_INSTFILES) ; \
fi
distclean: clean
@(for d in $(SUBDIRS); do rsd="$${d} $${rsd}"; done; \
for d in $${rsd}; do (cd $${d} && $(MAKE) $@); done)
-@rm -rf bin include lib library modules gnome
+ @if test -f non-tarball ; then \
+ rm -f $(NON_SVN_INSTFILES) non-tarball ; \
+ fi
-@rm -f Makeconf Makefile Makefile.bak Makefrag.* \
config.cache config.log config.status libtool \
- $(ACLOCAL_M4) acinclude.m4
+ $(ACLOCAL_M4) acinclude.m4 $(distdir).tar.gz
maintainer-clean: distclean
@echo "This command is intended for maintainers to use; it"
@echo "deletes files that may need special rules to rebuild"
@@ -145,6 +163,9 @@ distdir: $(DISTFILES) vignettes
|| ln $(srcdir)/$${f} $(distdir)/$${f} 2>/dev/null \
|| cp -p $(srcdir)/$${f} $(distdir)/$${f}; \
done
+ @for f in $(NON_SVN_INSTFILES); do \
+ cp -p $${f} $(distdir)/$${f}; \
+ done
@for d in $(SUBDIRS); do \
test -d $(distdir)/$${d} \
|| mkdir $(distdir)/$${d} \
@@ -160,6 +181,7 @@ distdir: $(DISTFILES) vignettes
done
@cp library/grid/doc/*.pdf library/grid/doc/index.html \
$(distdir)/src/library/grid/inst/doc
+ @(cd $(distdir); tools/link-recommended)
dvi info pdf:
-@(cd doc && $(MAKE) $@)
View
16 NEWS
@@ -21,6 +21,14 @@ NEW FEATURES
renamed to 'object'.
+DOCUMENTATION
+
+ o File doc/html/faq.html no longer exists, and doc/manual/R-FAQ.html
+ (which has active links to other manuals) is used instead.
+ (If makeinfo >= 4.5 is not available, the version on CRAN is
+ linked to.)
+
+
INSTALLATION CHANGES
o -D__NO_MATH_INLINES is only used on older ix86 glibc-based
@@ -31,10 +39,13 @@ INSTALLATION CHANGES
ensures that features such as inlining are only used if the
compilation flags specified support them. (PR#7257)
+ o Files FAQ, RESOURCES, doc/html/resources.html are no longer in
+ the SVN sources but are made by 'make dist'.
+
BUG FIXES
- o Configuring for Tcl/TK makes use of ${TK_LIB_SPEC} ${TK_LIBS}
+ o Configuring for Tcl/Tk makes use of ${TK_LIB_SPEC} ${TK_LIBS}
not ${TK_LIB_SPEC} ${TK_XLIBSW}, which is correct for
recent versions of Tk, but conceivably not for old
tkConfig.sh files.
@@ -120,6 +131,9 @@ BUG FIXES
not exist, rather than that its DESCRIPTION file is 'missing
or broken'.
+ o 'make dist' from builddir != sourcedir was copying not linking
+ recommended packages to *.tgz.
+
View
50 RESOURCES
@@ -1,50 +0,0 @@
-
- AVAILABLE R RESOURCES
-
-1 FAQ
-*****
-
-A collection of Frequently Asked Questions and their answers is maintained
-by Kurt Hornik <Kurt.Hornik@R-project.org> and can be found at the URL
-
- `http://CRAN.R-project.org/doc/FAQ/R-FAQ.html'
-
-A text version is in file `FAQ' in this directory, and an HTML version is
-available as file `doc/html/faq.html' and via the on-line help (on the
-index page given by `help.start()').
-
-2 Mailing lists
-***************
-
-Thanks to Martin Maechler <Martin.Maechler@R-project.org> there are a
-number of mailing lists which are used by R users and developers. See
-
- `http://www.R-project.org/mail.html'
-
-for details.
-
-3 Archives
-**********
-
-The Comprehensive R Archive Network (CRAN) is a collection of sites which
-carry identical material, consisting of the R distribution(s), the
-contributed extensions, documentation for R, and binaries, with the master
-site at `http://CRAN.R-project.org/' and information on daily mirrors
-available from
-
- `http://CRAN.R-project.org/mirrors.html'
-
-4 Bug-tracking system
-*********************
-
-R has a bug-tracking system (or perhaps a bug-filing system is a more
-precise description) available on the net at
-
- `http://bugs.R-project.org/'
-
-and via e-mail to <r-bugs@R-project.org>. The R function `bug.report()'
-can be used to invoke an editor from a within an R session and send the
-report to the right address. It also fills in some basic information, such
-as your R version and operating system, which has proved helpful in the
-debugging process.
-
View
8,824 acinclude.m4
0 additions, 8,824 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
8,410 aclocal.m4
0 additions, 8,410 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
31 doc/Makefile.in
@@ -12,7 +12,8 @@ include $(top_builddir)/Makeconf
distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
INSTFILES = KEYWORDS KEYWORDS.db
-DISTFILES = Makefile.in $(INSTFILES) R.1 R.aux
+DISTFILES = Makefile.in $(INSTFILES) R.aux
+NON_SVN_INSTFILES = R.1
SUBDIRS = html manual
HELP2MAN = $(PERL) $(top_srcdir)/tools/help2man.pl
@@ -21,7 +22,7 @@ all: Makefile R docs
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-R: Makefile @MAINTAINER_MODE_TRUE@ maintainer-build
+R: Makefile svnonly @MAINTAINER_MODE_TRUE@ maintainer-build
@for d in $(SUBDIRS); do \
(cd $${d} && $(MAKE) $@) || exit 1; \
done
@@ -75,25 +76,41 @@ clean:
(cd $${d} && $(MAKE) $@); \
done
@if test "$(BUILDDIR_IS_SRCDIR)" = no ; then \
- rm -f $(INSTFILES); \
+ rm -f $(INSTFILES) R.1; \
fi
distclean: clean
@for d in $(SUBDIRS); do \
(cd $${d} && $(MAKE) $@) || exit 1; \
done
+ @if test -f non-tarball ; then \
+ rm -f R.1 non-tarball ; \
+ fi
-@rm -f Makefile
maintainer-clean: distclean
- @echo "This command is intended for maintainers to use; it"
- @echo "deletes files that may need special rules to rebuild"
- -@rm -f $(srcdir)/R.1
-maintainer-build: $(srcdir)/R.1
+maintainer-build:
+
$(srcdir)/R.1: @MAINTAINER_MODE_TRUE@ $(top_srcdir)/VERSION $(top_srcdir)/date-stamp $(top_srcdir)/src/scripts/R.sh.in $(srcdir)/R.aux
@(cd $(top_builddir)/src/scripts && $(MAKE) R.fe)
@$(HELP2MAN) --include=$(srcdir)/R.aux --no-info --output=$@ \
--name="a language for data analysis and graphics" \
$(top_builddir)/src/scripts/R.fe
+svnonly:
+ @if test ! -f "$(srcdir)/R.1" ; then \
+ (cd $(top_builddir)/src/scripts && $(MAKE) R.fe) ; \
+ $(HELP2MAN) --include=$(srcdir)/R.aux --no-info --output=R.1 \
+ --name="a language for data analysis and graphics" \
+ $(top_builddir)/src/scripts/R.fe ; \
+ touch non-tarball ; \
+ else \
+ if test "$(BUILDDIR_IS_SRCDIR)" = no ; then \
+ for f in $(NON_SVN_INSTFILES); do \
+ $(INSTALL_DATA) $(srcdir)/$${f} "$(rhome)/$(subdir)"; \
+ done \
+ fi \
+ fi
+
distdir: $(DISTFILES)
@for f in $(DISTFILES); do \
test -f $(distdir)/$${f} \
View
189 doc/R.1
@@ -1,189 +0,0 @@
-.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.020.
-.TH R "1" "October 2004" "R 2.1.0" FSF
-.SH NAME
-R \- a language for data analysis and graphics
-.SH SYNOPSIS
-.B R
-[\fIoptions\fR] [\fI< infile\fR] [\fI> outfile\fR]
-.br
-.B R
-\fICMD command \fR[\fIarguments\fR]
-.SH DESCRIPTION
-Start R, a system for statistical computation and graphics, with the
-specified options, or invoke an R tool via the 'R CMD' interface.
-.PP
-R is a language which bears a passing resemblance to the S language
-developed at AT&T Bell Laboratories. It provides support for a variety
-of statistical and graphical analyses. R is a true computer language
-which contains a number of control-flow constructions for iteration and
-alternation. It allows users to add additional functionality by
-defining new functions.
-.LP
-On platforms which support the \fBdlopen\fP(3) interface, Fortran and C
-code can be linked and called at run time.
-.LP
-On systems which have the GNU \fBreadline\fP(3) library, R will maintain
-a command history, so that commands can be recalled, edited and
-re-executed.
-.SH OPTIONS
-
-Most options control what happens at the beginning and at the end of an
-R session, in particular which files are being read and written, and how
-much memory is reserved for the R process.
-.TP
-\fB\-h\fR, \fB\-\-help\fR
-Print short help message and exit
-.TP
-\fB\-\-version\fR
-Print version info and exit
-.TP
-RHOME
-Print path to R home directory and exit
-.TP
-\fB\-\-save\fR
-Do save workspace at the end of the session
-.TP
-\fB\-\-no\-save\fR
-Don't save it
-.TP
-\fB\-\-no\-environ\fR
-Don't read the site and user environment files
-.TP
-\fB\-\-no\-site\-file\fR
-Don't read the site-wide Rprofile
-.TP
-\fB\-\-no\-init\-file\fR
-Don't read the .Rprofile or ~/.Rprofile files
-.TP
-\fB\-\-restore\fR
-Do restore previously saved objects at startup
-.TP
-\fB\-\-no\-restore\-data\fR
-Don't restore previously saved objects
-.TP
-\fB\-\-no\-restore\-history\fR
-Don't restore the R history file
-.TP
-\fB\-\-no\-restore\fR
-Don't restore anything
-.TP
-\fB\-\-vanilla\fR
-Combine \fB\-\-no\-save\fR, \fB\-\-no\-restore\fR, \fB\-\-no\-site\-file\fR,
-\fB\-\-no\-init\-file\fR and \fB\-\-no\-environ\fR
-.TP
-\fB\-\-no\-readline\fR
-Don't use readline for command-line editing
-.TP
-\fB\-\-min\-vsize\fR=\fIN\fR
-Set vector heap min to N bytes; '4M' = 4 MegaB
-.TP
-\fB\-\-max\-vsize\fR=\fIN\fR
-Set vector heap max to N bytes;
-.TP
-\fB\-\-min\-nsize\fR=\fIN\fR
-Set min number of cons cells to N
-.TP
-\fB\-\-max\-nsize\fR=\fIN\fR
-Set max number of cons cells to N
-.TP
-\fB\-\-max\-ppsize\fR=\fIN\fR
-Set max size of protect stack to N
-.TP
-\fB\-q\fR, \fB\-\-quiet\fR
-Don't print startup message
-.TP
-\fB\-\-silent\fR
-Same as \fB\-\-quiet\fR
-.TP
-\fB\-\-slave\fR
-Make R run as quietly as possible
-.TP
-\fB\-\-verbose\fR
-Print more information about progress
-.TP
-\fB\-d\fR, \fB\-\-debugger\fR=\fINAME\fR
-Run R through debugger NAME
-.TP
-\fB\-\-debugger\-args\fR=\fIARGS\fR
-Pass ARGS as arguments to the debugger
-.TP
-\fB\-g\fR, \fB\-\-gui\fR=\fITYPE\fR
-Use TYPE as GUI; possible values are 'X11'
-(default), 'none' and 'gnome'
-.TP
-\fB\-\-args\fR
-Skip the rest of the command line
-.SS "Commands:"
-.TP
-BATCH
-Run R in batch mode
-.TP
-COMPILE
-Compile files for use with R
-.TP
-SHLIB
-Build shared library for dynamic loading
-.TP
-INSTALL
-Install add-on packages
-.TP
-REMOVE
-Remove add-on packages
-.TP
-build
-Build add-on packages
-.TP
-check
-Check add-on packages
-.TP
-LINK
-Front-end for creating executable programs
-.TP
-Rprof
-Post-process R profiling files
-.TP
-Rdconv
-Convert Rd format to various other formats
-.TP
-Rd2dvi
-Convert Rd format to DVI/PDF
-.TP
-Rd2txt
-Convert Rd format to pretty text
-.TP
-Sd2Rd
-Convert S documentation to Rd format
-.TP
-config
-Obtain configuration information about R
-.PP
-Please use 'R CMD command \fB\-\-help\fR' to obtain further information about
-the usage of 'command'.
-.SH "REPORTING BUGS"
-Report bugs to <r-bugs@r-project.org>.
-.SH COPYRIGHT
-Copyright \(co 2004 R Development Core Team
-.PP
-R is free software and comes with ABSOLUTELY NO WARRANTY.
-You are welcome to redistribute it under the terms of the GNU
-General Public License. For more information about these matters,
-see http://www.gnu.org/copyleft/gpl.html.
-.SH "SEE ALSO"
-
-The full documentation for R is provided by a collection of Texinfo
-manuals and individual help for R objects which is also available
-on-line.
-.LP
-Start R and type \fB?\fP\fItopic\fP at the R prompt to obtain on-line
-information for `\fItopic\fP'.
-.LP
-If the processed manuals have been installed they will be available as
-DVI and/or PDF files in the directory `R RHOME`/doc/manual.
-.LP
-If the \fBinfo\fP program and the R manuals are installed on your
-system, typing \fBinfo -f R-intro\fP, \fBinfo -f R-data\fP,
-\fBinfo -f R-exts\fP,\fBinfo
--f R-FAQ\fP and \fBinfo -f R-lang\fP should give you access to
-``An Introduction to R'' (the basic manual), the ``R Data Import/Export''
-Guide, the ``R Extension Writer's Guide'', the ``R FAQ''
-and the ``The R Language Definition''.
View
34 doc/html/Makefile.in
@@ -15,48 +15,60 @@ INSTFILES = \
R.css \
left.jpg logo.jpg logosm.jpg right.jpg up.jpg \
about.html \
- faq.html \
packages-head.html \
- resources.html \
template.html \
thanks.html
-## </FIXME>
+NON_SVN_INSTFILES = resources.html
DISTFILES = Makefile.in $(INSTFILES) index-default.html
SUBDIRS = search
OBJECTS = index.html
## <FIXME>
## build-help really should not create packages.html in *this* directory.
-## Remove 'function.html' eventually ...
-CLEANFILES = packages.html packages-foot.html $(OBJECTS) function.html
+CLEANFILES = packages.html packages-foot.html $(OBJECTS)
## </FIXME>
-DISTCLEANFILES = Makefile
+DISTCLEANFILES = Makefile $(NON_SVN_INSTFILES)
all: Makefile R
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-R: Makefile $(OBJECTS)
+R: Makefile $(OBJECTS) svnonly
@if test "$(BUILDDIR_IS_SRCDIR)" = no ; then \
$(MAKE) rhome=$(top_builddir) install-sources; \
fi
@for d in $(SUBDIRS); do \
(cd $${d} && $(MAKE) $@) || exit 1; \
done
+svnonly:
+ @if test ! -f "$(srcdir)/resources.html" ; then \
+ cd ../manual && $(MAKE) html-non-svn ; \
+ touch non-tarball ; \
+ else \
+ if test "$(BUILDDIR_IS_SRCDIR)" = no ; then \
+ for f in $(NON_SVN_INSTFILES); do \
+ $(INSTALL_DATA) $(srcdir)/$${f} "$(rhome)/$(subdir)"; \
+ done \
+ fi \
+ fi
+
index.html: FORCE
@$(PERL) $(top_srcdir)/tools/linkcheck.pl \
$(srcdir)/index-default.html > $@ || \
$(INSTALL_DATA) $(srcdir)/index-default.html $@
FORCE:
-install: install-message installdirs install-sources
+install: svnonly install-message installdirs install-sources
@for f in $(OBJECTS); do \
$(INSTALL_DATA) $${f} "$(rhome)/$(subdir)"; \
done
@for d in $(SUBDIRS); do \
(cd $${d} && $(MAKE) $@) || exit 1; \
done
+ @for f in $(NON_SVN_INSTFILES); do \
+ $(INSTALL_DATA) $${f} "$(rhome)/$(subdir)"; \
+ done
installdirs:
@$(MKINSTALLDIRS) "$(rhome)/$(subdir)"
install-message:
@@ -90,6 +102,9 @@ distclean: clean
@for d in $(SUBDIRS); do \
(cd $${d} && $(MAKE) $@); \
done
+ @if test -f non-tarball ; then \
+ rm -f $(NON_SVN_INSTFILES) non-tarball ; \
+ fi
-@test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
maintainer-clean: distclean
@@ -99,6 +114,9 @@ distdir: $(DISTFILES)
|| ln $(srcdir)/$${f} $(distdir)/$${f} 2>/dev/null \
|| cp -p $(srcdir)/$${f} $(distdir)/$${f}; \
done
+ @for f in $(NON_SVN_INSTFILES); do \
+ cp -p $${f} $(distdir)/$${f}; \
+ done
@for d in $(SUBDIRS); do \
test -d $(distdir)/$${d} \
|| mkdir $(distdir)/$${d} \
View
4,363 doc/html/faq.html
0 additions, 4,363 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
2 doc/html/index-default.html
@@ -58,7 +58,7 @@
</tr>
<tr>
<td align="center"><a href="../../COPYING">License</a></td>
-<td align="center"><a href="faq.html">Frequently Asked Questions</a> </td>
+<td align="center"><a href="../manual/R-FAQ.html">Frequently Asked Questions</a> </td>
<td align="center"><a href="../../THANKS">Thanks</a> </td>
</tr>
</table>
View
94 doc/html/resources.html
@@ -1,94 +0,0 @@
-<html lang="en">
-<head>
-<title>R Resources</title>
-<meta http-equiv="Content-Type" content="text/html">
-<meta name="description" content="R Resources">
-<meta name="generator" content="makeinfo 4.7">
-<link title="Top" rel="top" href="#Top">
-<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage">
-<meta http-equiv="Content-Style-Type" content="text/css">
-<style type="text/css"><!--
- pre.display { font-family:inherit }
- pre.format { font-family:inherit }
- pre.smalldisplay { font-family:inherit; font-size:smaller }
- pre.smallformat { font-family:inherit; font-size:smaller }
- pre.smallexample { font-size:smaller }
- pre.smalllisp { font-size:smaller }
- span.sc { font-variant:small-caps }
- span.roman { font-family: serif; font-weight: normal; }
---></style>
-</head>
-<body>
-<HTML>
-<HEAD>
-<TITLE>R: Resources</TITLE>
-<LINK REL=STYLESHEET TYPE="text/css" HREF="R.css">
-</HEAD>
-
-<p><BODY>
-<h1>Other Resources
-<img class="toplogo" src="logo.jpg" alt="[R logo]">
-</h1>
-<hr width="100%">
-
-<p><a name="Top"></a>
-
-<p><a name="FAQ"></a>
-
-<h3 class="section">0.1 FAQ</h3>
-
-<p>A collection of <a href="faq.html">Frequently Asked Questions</a> and their
-answers is maintained by <a href="mailto:Kurt.Hornik@R-project.org">Kurt Hornik</a>
-and can be found at the <acronym>URL</acronym>
-
-<blockquote>
-<a href="http://CRAN.R-project.org/doc/FAQ/R-FAQ.html">http://CRAN.R-project.org/doc/FAQ/R-FAQ.html</a>
-</blockquote>
-
-<p><a name="Mailing-lists"></a>
-
-<h3 class="section">0.2 Mailing lists</h3>
-
-<p>Thanks to <a href="mailto:Martin.Maechler@R-project.org">Martin Maechler</a> there
-are a number of mailing lists which are used by R users and developers.
-See
-
-<blockquote>
-<a href="http://www.R-project.org/mail.html">http://www.R-project.org/mail.html</a>
-</blockquote>
-
-<p>for details.
-
-<p><a name="Archives"></a>
-
-<h3 class="section">0.3 Archives</h3>
-
-<p>The Comprehensive R Archive Network (<acronym>CRAN</acronym>) is a collection of
-sites which carry identical material, consisting of the R
-distribution(s), the contributed extensions, documentation for R, and
-binaries, with the master site at <a href="http://CRAN.R-project.org/">http://CRAN.R-project.org/</a> and
-information on daily mirrors available from
-
-<blockquote>
-<a href="http://CRAN.R-project.org/mirrors.html">http://CRAN.R-project.org/mirrors.html</a>
-</blockquote>
-
-<p><a name="Bug_002dtracking-system"></a>
-
-<h3 class="section">0.4 Bug-tracking system</h3>
-
-<p>R has a bug-tracking system (or perhaps a bug-filing system is a more
-precise description) available on the net at
-
-<blockquote>
-<a href="http://bugs.R-project.org/">http://bugs.R-project.org/</a>
-</blockquote>
-
-<p class="noindent">and via e-mail to <a href="mailto:r-bugs@R-project.org">r-bugs@R-project.org</a>. The R function
-<code>bug.report()</code> can be used to invoke an editor from a within an R
-session and send the report to the right address. It also fills in some
-basic information, such as your R version and operating system, which
-has proved helpful in the debugging process.
-
-</body></html>
-
View
47 doc/manual/Makefile.in
@@ -417,35 +417,7 @@ distclean: clean
-@rm -f Makefile
maintainer-clean: distclean
-maintainer-build: \
- $(top_srcdir)/FAQ \
- $(top_srcdir)/RESOURCES \
- $(top_srcdir)/doc/html/faq.html \
- $(top_srcdir)/doc/html/resources.html
-$(top_srcdir)/FAQ: @MAINTAINER_MODE_TRUE@ $(srcdir)/R-FAQ.texi
- @if test "$(MAKEINFO)" = false; then \
- echo "ERROR: 'makeinfo' v4 needed but missing on your system."; \
- exit 1; \
- fi
- $(TEXI2TEXT) $(srcdir)/R-FAQ.texi -o $@
-$(top_srcdir)/doc/html/faq.html: @MAINTAINER_MODE_TRUE@ $(srcdir)/R-FAQ.texi
- @if test "$(MAKEINFO)" = false; then \
- echo "ERROR: 'makeinfo' v4 needed but missing on your system."; \
- exit 1; \
- fi
- $(TEXI2HTML) --number-sections $(srcdir)/R-FAQ.texi -o $@
-$(top_srcdir)/RESOURCES: @MAINTAINER_MODE_TRUE@ $(srcdir)/resources.texi
- @if test "$(MAKEINFO)" = false; then \
- echo "ERROR: 'makeinfo' v4 needed but missing on your system."; \
- exit 1; \
- fi
- $(TEXI2TEXT) $(srcdir)/resources.texi -o $@
-$(top_srcdir)/doc/html/resources.html: @MAINTAINER_MODE_TRUE@ $(srcdir)/resources.texi
- @if test "$(MAKEINFO)" = false; then \
- echo "ERROR: 'makeinfo' v4 needed but missing on your system."; \
- exit 1; \
- fi
- $(TEXI2HTML) --no-headers $(srcdir)/resources.texi -o $@
+maintainer-build:
distdir: $(DISTFILES)
@for f in $(DISTFILES); do \
@@ -459,10 +431,23 @@ distdir: $(DISTFILES)
|| exit 1; \
done
@if test "$(MAKEINFO)" = false; then \
- echo "ERROR: 'makeinfo' v4 needed but missing on your system."; \
+ echo "ERROR: 'makeinfo' v4.5 or later needed but missing on your system."; \
exit 1; \
fi
# $(distdir)/doc/html has already been created
- $(TEXI2HTML) --no-headers --number-sections \
+ @$(TEXI2HTML) --no-headers --number-sections \
$(srcdir)/R-admin.texi -I$(srcdir) \
-o $(distdir)/../html/R-admin.html
+# front-matter files
+# @$(TEXI2TEXT) $(srcdir)/resources.texi -o $(distdir)/../../RESOURCES
+# @$(TEXI2TEXT) $(srcdir)/R-FAQ.texi -o $(distdir)/../../FAQ
+# @$(TEXI2HTML) --no-headers $(srcdir)/resources.texi \
+# -o $(distdir)/../html/resources.html
+
+front-matter:
+ @$(TEXI2TEXT) $(srcdir)/resources.texi -o ${top_builddir}/RESOURCES
+ @$(TEXI2TEXT) $(srcdir)/R-FAQ.texi -o ${top_builddir}/FAQ
+
+html-non-svn:
+ @$(TEXI2HTML) --no-headers $(srcdir)/resources.texi \
+ -o ../html/resources.html
View
2 src/library/Recommended/Makefile.in
@@ -70,7 +70,7 @@ distclean: clean
maintainer-clean: distclean
distdir: $(DISTFILES)
- @for f in $(DISTFILES) `cd $(srcdir) && ls *.tar.gz *.tgz`; do \
+ @for f in $(DISTFILES) `cd $(srcdir) && ls *.tar.gz`; do \
test -f $(distdir)/$${f} \
|| ln $(srcdir)/$${f} $(distdir)/$${f} 2>/dev/null \
|| cp -p $(srcdir)/$${f} $(distdir)/$${f}; \
View
5 tools/link-recommended
@@ -11,11 +11,6 @@ TOOLS_DIR=`echo ${0} | sed 's%/[^/][^/]*$%%'`
sed 's/.*=//'`
cd src/library/Recommended
- ## <FIXME>
- ## Remove eventually.
- rm -f *_tgz
- ## </FIXME>
-
## Link all each package to a simplified name so that Make has an
## easier time. Notice that as far as Make is concerned, the symlinks
## have the same timestamp as the file they point to.

0 comments on commit 0f0950c

Please sign in to comment.