Commit 2c0e5050 authored by Radford Neal's avatar Radford Neal

introduce R_BIT_BUCKET for stuff previously going to /dev/null

parent 183011c1
......@@ -38,7 +38,7 @@ install-R-framework:
@## the resulting libR will point dyld to the fat libR regardless of its origin
@(cd "$(DESTDIR)$(R_FRAMEWORK_DIR)/Resources/lib" && \
install_name_tool -id "$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/lib/libR.dylib" $(Rexeclibdir)/libR.dylib)
@( otool=otool ; if otool -D "$(DESTDIR)$(Rexeclibdir)/libR.dylib"|grep 'not an object'>/dev/null; then otool=otool64; fi; \
@( otool=otool ; if otool -D "$(DESTDIR)$(Rexeclibdir)/libR.dylib"|grep 'not an object'>$(R_BIT_BUCKET); then otool=otool64; fi; \
for lib in Rlapack Rblas R; do \
if test -e "$(DESTDIR)$(Rexeclibdir)/lib$${lib}.dylib"; then $(ECHO) " lib$${lib}"; \
find "$(DESTDIR)$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/" -name '*.so' -or -name '*.dylib' | \
......@@ -55,7 +55,7 @@ install-R-framework:
install_name_tool -id "$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/lib/lib$${lib}.dylib" \
"$(DESTDIR)$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/lib/lib$${lib}.dylib"; \
fi; \
for rexe in `ls "$(DESTDIR)$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)"/Resources/bin/exec/*/R "$(DESTDIR)$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/bin/exec/R" 2>/dev/null`; do \
for rexe in `ls "$(DESTDIR)$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)"/Resources/bin/exec/*/R "$(DESTDIR)$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/bin/exec/R" 2>$(R_BIT_BUCKET)`; do \
install_name_tool -change lib$${lib}.dylib \
"$(R_FRAMEWORK_DIR)/Versions/$(FW_VERSION)/Resources/lib/lib$${lib}.dylib" "$$rexe" ; \
done; \
......
......@@ -99,7 +99,7 @@ svnonly:
@if test ! -f "$(srcdir)/doc/FAQ" || test -f non-tarball ; then \
(cd doc/manual && $(MAKE) front-matter html-non-svn) ; \
touch non-tarball ; \
(cd $(srcdir); LC_ALL=C TZ=GMT svn info || $(ECHO) "Revision: unknown") 2> /dev/null \
(cd $(srcdir); LC_ALL=C TZ=GMT svn info || $(ECHO) "Revision: unknown") 2> $(R_BIT_BUCKET) \
| sed -n -e '/^Revision/p' -e '/^Last Changed Date/'p \
| cut -d' ' -f1,2,3,4 > SVN-REVISION-tmp ; \
$(SHELL) $(top_srcdir)/tools/move-if-change SVN-REVISION-tmp SVN-REVISION ; \
......@@ -128,7 +128,7 @@ uninstall:
rm -f "$(DESTDIR)$(rhome)/$${f}"; \
done
@rm -rf "$(DESTDIR)$(Rexecbindir)" "$(DESTDIR)$(rhome)/lib"
@rmdir "$(DESTDIR)$(rhome)" 2>/dev/null \
@rmdir "$(DESTDIR)$(rhome)" 2>$(R_BIT_BUCKET) \
|| $(ECHO) " dir $(DESTDIR)$(rhome) not removed"
@rm -f "$(DESTDIR)${libdir}/libR$(DYLIB_EXT)"
......@@ -178,7 +178,7 @@ distdir: $(DISTFILES) vignettes
@-chmod 755 $(distdir)
@for f in $(DISTFILES); do \
test -f $(distdir)/$${f} \
|| ln $(srcdir)/$${f} $(distdir)/$${f} 2>/dev/null \
|| ln $(srcdir)/$${f} $(distdir)/$${f} 2>$(R_BIT_BUCKET) \
|| cp -p $(srcdir)/$${f} $(distdir)/$${f}; \
done
@for f in NEWS NEWS.pdf $(NON_SVN_INSTFILES) ; do \
......
......@@ -103,7 +103,7 @@ uninstall:
for f in $(INSTFILES) $(NON_SVN_INSTFILES) NEWS.rds; do \
rm -f "$(DESTDIR)$(rdocdir)"/$${f}; \
done; \
rmdir "$(DESTDIR)$(rdocdir)" 2>/dev/null \
rmdir "$(DESTDIR)$(rdocdir)" 2>$(R_BIT_BUCKET) \
|| $(ECHO) " subdir $(DESTDIR)$(subdir) not removed"; \
fi
@rm -f $(DESTDIR)$(mandir)/man1/R.1 $(DESTDIR)$(mandir)/man1/Rscript.1
......@@ -143,7 +143,7 @@ svnonly:
distdir: $(DISTFILES)
@for f in $(DISTFILES); do \
test -f $(distdir)/$${f} \
|| ln $(srcdir)/$${f} $(distdir)/$${f} 2>/dev/null \
|| ln $(srcdir)/$${f} $(distdir)/$${f} 2>$(R_BIT_BUCKET) \
|| cp -p $(srcdir)/$${f} $(distdir)/$${f}; \
done
@for f in FAQ RESOURCES ; do \
......
......@@ -69,7 +69,7 @@ uninstall:
@for f in $(CLEANFILES) $(INSTFILES) $(NON_SVN_INSTFILES) $(OBJECTS); do \
rm -f "$(DESTDIR)$(rdocdir)/html/$${f}"; \
done
@rmdir "$(DESTDIR)$(rdocdir)/html" 2>/dev/null \
@rmdir "$(DESTDIR)$(rdocdir)/html" 2>$(R_BIT_BUCKET) \
|| $(ECHO) " subdir $(DESTDIR)$(subdir) not removed"
mostlyclean:
......@@ -88,7 +88,7 @@ maintainer-clean: distclean
distdir: $(DISTFILES)
@for f in $(DISTFILES); do \
test -f $(distdir)/$${f} \
|| ln $(srcdir)/$${f} $(distdir)/$${f} 2>/dev/null \
|| ln $(srcdir)/$${f} $(distdir)/$${f} 2>$(R_BIT_BUCKET) \
|| cp -p $(srcdir)/$${f} $(distdir)/$${f}; \
done
@for f in $(NON_SVN_INSTFILES); do \
......
......@@ -141,7 +141,7 @@ FORCE:
$(texinputs_RECOMMENDED): FORCE
@(pkg=`basename $@ -pkg.tex`; \
if find $@ -newer $(top_builddir)/library/$${pkg}/DESCRIPTION \
-print 2> /dev/null | grep $@ > /dev/null; then :; else \
-print 2> $(R_BIT_BUCKET) | grep $@ > $(R_BIT_BUCKET); then :; else \
$(ECHO) "collecting LaTeX docs for package '$${pkg}' ..."; \
$(ECHO) "tools:::.pkg2tex(\"$(top_builddir)/library/$${pkg}\")" \
| LC_ALL=C $(R_EXE) ; \
......@@ -336,7 +336,7 @@ maintainer-clean: distclean
distdir: $(DISTFILES)
@for f in $(DISTFILES); do \
test -f $(distdir)/$${f} \
|| ln $(srcdir)/$${f} $(distdir)/$${f} 2>/dev/null \
|| ln $(srcdir)/$${f} $(distdir)/$${f} 2>$(R_BIT_BUCKET) \
|| cp -p $(srcdir)/$${f} $(distdir)/$${f}; \
done
@for d in $(SUBDIRS_WITH_NO_BUILD); do \
......
......@@ -70,9 +70,9 @@ uninstall:
(cd "$(DESTDIR)$(rhome)/$(subdir)" && rm -f $(INSTFILES)); \
(cd "$(DESTDIR)$(rhome)/$(subdir)$(R_ARCH)" && rm -f $(OBJECTS)); \
if test -n "$(R_ARCH)"; then \
rmdir "$(DESTDIR)$(rhome)/$(subdir)$(R_ARCH)" 2> /dev/null ; \
rmdir "$(DESTDIR)$(rhome)/$(subdir)$(R_ARCH)" 2> $(R_BIT_BUCKET) ; \
fi ; \
rmdir "$(DESTDIR)$(rhome)/$(subdir)" 2> /dev/null \
rmdir "$(DESTDIR)$(rhome)/$(subdir)" 2> $(R_BIT_BUCKET) \
|| $(ECHO) " subdir $(DESTDIR)$(subdir) not removed"; \
fi
......@@ -94,6 +94,6 @@ maintainer-clean: distclean
distdir: $(DISTFILES)
@for f in $(DISTFILES); do \
test -f $(distdir)/$${f} \
|| ln $(srcdir)/$${f} $(distdir)/$${f} 2>/dev/null \
|| ln $(srcdir)/$${f} $(distdir)/$${f} 2>$(R_BIT_BUCKET) \
|| cp -p $(srcdir)/$${f} $(distdir)/$${f}; \
done
......@@ -40,6 +40,6 @@ install install-strip uninstall TAGS info dvi check:
distdir: $(DISTFILES)
@for f in $(DISTFILES); do \
test -f $(distdir)/$${f} \
|| ln $(srcdir)/$${f} $(distdir)/$${f} 2>/dev/null \
|| ln $(srcdir)/$${f} $(distdir)/$${f} 2>$(R_BIT_BUCKET) \
|| cp -p $(srcdir)/$${f} $(distdir)/$${f}; \
done
Debugging stuff.
Introduced R_ABORT to get immediate core dump.
Introduced R_BIT_BUCKET to direct output previously always going to /dev/null.
......@@ -132,7 +132,7 @@ $(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
if test -f $(srcdir)/$(DOMAIN).pot; then \
sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \
sed -f remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \
if cmp $(DOMAIN).1po $(DOMAIN).2po >/dev/null 2>&1; then \
if cmp $(DOMAIN).1po $(DOMAIN).2po >$(R_BIT_BUCKET) 2>&1; then \
rm -f $(DOMAIN).1po $(DOMAIN).2po $(DOMAIN).po; \
else \
rm -f $(DOMAIN).1po $(DOMAIN).2po $(srcdir)/$(DOMAIN).pot && \
......@@ -160,7 +160,7 @@ RGui.pot-update: remove-potcdate.sed
if test -f $(srcdir)/RGui.pot; then \
sed -f remove-potcdate.sed < $(srcdir)/RGui.pot > RGui.1po && \
sed -f remove-potcdate.sed < RGui.po > RGui.2po && \
if cmp RGui.1po RGui.2po >/dev/null 2>&1; then \
if cmp RGui.1po RGui.2po >$(R_BIT_BUCKET) 2>&1; then \
rm -f RGui.1po RGui.2po RGui.po; \
else \
rm -f RGui.1po RGui.2po $(srcdir)/RGui.pot && \
......@@ -208,7 +208,7 @@ install-data-yes:
echo " $$lang"; \
for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
if test -n "$$lc"; then \
if (cd $(Rlocaledir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
if (cd $(Rlocaledir)/$$lang && LC_ALL=C ls -l -d $$lc 2>$(R_BIT_BUCKET)) | grep ' -> ' >$(R_BIT_BUCKET); then \
link=`cd $(Rlocaledir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \
mv $(Rlocaledir)/$$lang/$$lc $(Rlocaledir)/$$lang/$$lc.old; \
mkdir $(Rlocaledir)/$$lang/$$lc; \
......@@ -228,8 +228,8 @@ install-data-yes:
fi; \
fi; \
rm -f $(Rlocaledir)/$$lang/$$lc/$(DOMAIN).mo; \
ln -s ../LC_MESSAGES/$(DOMAIN).mo $(Rlocaledir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \
ln $(Rlocaledir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(Rlocaledir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \
ln -s ../LC_MESSAGES/$(DOMAIN).mo $(Rlocaledir)/$$lang/$$lc/$(DOMAIN).mo 2>$(R_BIT_BUCKET) || \
ln $(Rlocaledir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(Rlocaledir)/$$lang/$$lc/$(DOMAIN).mo 2>$(R_BIT_BUCKET) || \
cp -p $(Rlocaledir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(Rlocaledir)/$$lang/$$lc/$(DOMAIN).mo; \
echo " $$lang"; \
fi; \
......@@ -252,7 +252,7 @@ installdirs-data-yes:
$(mkinstalldirs) $$dir; \
for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
if test -n "$$lc"; then \
if (cd $(Rlocaledir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
if (cd $(Rlocaledir)/$$lang && LC_ALL=C ls -l -d $$lc 2>$(R_BIT_BUCKET)) | grep ' -> ' >$(R_BIT_BUCKET); then \
link=`cd $(Rlocaledir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \
mv $(Rlocaledir)/$$lang/$$lc $(Rlocaledir)/$$lang/$$lc.old; \
mkdir $(Rlocaledir)/$$lang/$$lc; \
......@@ -363,14 +363,14 @@ pkg-update: remove-potcdate.sed en@quot.insert-header
-o - `LC_COLLATE=C ls *.c`) > $${pkg}.po ; \
sed -f remove-potcdate.sed < $${src}/po/$${pkg}.pot > $${pkg}.1po && \
sed -f remove-potcdate.sed < $${pkg}.po > $${pkg}.2po && \
if cmp $${pkg}.1po $${pkg}.2po >/dev/null 2>&1; then \
if cmp $${pkg}.1po $${pkg}.2po >$(R_BIT_BUCKET) 2>&1; then \
rm -f $${pkg}.1po $${pkg}.2po $${pkg}.po; \
else \
rm -f $${pkg}.1po $${pkg}.2po $${src}/po/$${pkg}.pot && \
mv $${pkg}.po $${src}/po/$${pkg}.pot; \
fi; \
echo "and translations"; \
trs=`$${cdcmd} && ls *.po 2> /dev/null`; \
trs=`$${cdcmd} && ls *.po 2> $(R_BIT_BUCKET)`; \
trs=`echo $${trs} | sed -e 's/R-[^.]*\.po//g' -e s/en@quot.po//`; \
if test -n "$${trs}"; then \
for tr in $${trs}; do \
......@@ -385,8 +385,8 @@ pkg-update: remove-potcdate.sed en@quot.insert-header
echo $(ECHO_N) " $$lang:$(ECHO_C)"; \
LC_ALL=C; export LC_ALL; \
cd $(srcdir); \
if $(MSGINIT) -i $${psrc}/$${pkg}.pot --no-translator -l en -o - 2>/dev/null | sed -f $$tmpdir/$$lang.insert-header | sed -e s/PACKAGE/R/ -e s/VERSION/$(VERSION)/ | $(MSGCONV) -t UTF-8 | $(MSGFILTER) sed -f $(srcdir)/quot.sed 2>/dev/null > $$tmpdir/$$lang.new.po; then \
if cmp $${psrc}/$$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
if $(MSGINIT) -i $${psrc}/$${pkg}.pot --no-translator -l en -o - 2>$(R_BIT_BUCKET) | sed -f $$tmpdir/$$lang.insert-header | sed -e s/PACKAGE/R/ -e s/VERSION/$(VERSION)/ | $(MSGCONV) -t UTF-8 | $(MSGFILTER) sed -f $(srcdir)/quot.sed 2>$(R_BIT_BUCKET) > $$tmpdir/$$lang.new.po; then \
if cmp $${psrc}/$$lang.po $$tmpdir/$$lang.new.po >$(R_BIT_BUCKET) 2>&1; then \
rm -f $$tmpdir/$$lang.new.po; \
else \
if mv -f $$tmpdir/$$lang.new.po $${psrc}/$$lang.po; then \
......@@ -412,17 +412,17 @@ pkg-update: remove-potcdate.sed en@quot.insert-header
touch "$${src}/po/R-$${pkg}.pot"; \
fi ; \
echo "tools::xgettext2pot('$${src}', 'R-$${pkg}.po')" \
| R_DEFAULT_PACKAGES= LC_COLLATE=C $(R_EXE) --slave > /dev/null; \
| R_DEFAULT_PACKAGES= LC_COLLATE=C $(R_EXE) --slave > $(R_BIT_BUCKET); \
sed -f remove-potcdate.sed < $${src}/po/R-$${pkg}.pot > R-$${pkg}.1po && \
sed -f remove-potcdate.sed < R-$${pkg}.po > R-$${pkg}.2po && \
if cmp R-$${pkg}.1po R-$${pkg}.2po >/dev/null 2>&1; then \
if cmp R-$${pkg}.1po R-$${pkg}.2po >$(R_BIT_BUCKET) 2>&1; then \
rm -f R-$${pkg}.1po R-$${pkg}.2po R-$${pkg}.po; \
else \
rm -f R-$${pkg}.1po R-$${pkg}.2po $${src}/po/R-$${pkg}.pot && \
mv R-$${pkg}.po $${src}/po/R-$${pkg}.pot; \
fi ; \
echo "and translations"; \
trs=`$${cdcmd} && ls R-*.po 2> /dev/null`; \
trs=`$${cdcmd} && ls R-*.po 2> $(R_BIT_BUCKET)`; \
trs=`echo $${trs} | sed -e s/R-en@quot.po//`; \
if test -n "$${trs}"; then \
for tr in $${trs}; do \
......@@ -437,8 +437,8 @@ pkg-update: remove-potcdate.sed en@quot.insert-header
echo $(ECHO_N) " $$lang:$(ECHO_C)"; \
LC_ALL=C; export LC_ALL; \
cd $(srcdir); \
if $(MSGINIT) -i $${psrc}/R-$${pkg}.pot --no-translator -l en -o - 2>/dev/null | sed -f $$tmpdir/$$lang.insert-header | sed -e s/PACKAGE/R/ -e s/VERSION/$(VERSION)/ | $(MSGCONV) -t UTF-8 | $(MSGFILTER) sed -f $(srcdir)/quot.sed 2>/dev/null > $$tmpdir/R-$$lang.new.po; then \
if cmp $${psrc}/R-$$lang.po $$tmpdir/R-$$lang.new.po >/dev/null 2>&1; then \
if $(MSGINIT) -i $${psrc}/R-$${pkg}.pot --no-translator -l en -o - 2>$(R_BIT_BUCKET) | sed -f $$tmpdir/$$lang.insert-header | sed -e s/PACKAGE/R/ -e s/VERSION/$(VERSION)/ | $(MSGCONV) -t UTF-8 | $(MSGFILTER) sed -f $(srcdir)/quot.sed 2>$(R_BIT_BUCKET) > $$tmpdir/R-$$lang.new.po; then \
if cmp $${psrc}/R-$$lang.po $$tmpdir/R-$$lang.new.po >$(R_BIT_BUCKET) 2>&1; then \
rm -f $$tmpdir/R-$$lang.new.po; \
else \
if mv -f $$tmpdir/R-$$lang.new.po $${psrc}/R-$$lang.po; then \
......@@ -473,7 +473,7 @@ pkg-update: remove-potcdate.sed en@quot.insert-header
echo "$${cdcmd}$(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \
cd $(srcdir); \
if $(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$tmpdir/$$lang.new.po; then \
if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
if cmp $$lang.po $$tmpdir/$$lang.new.po >$(R_BIT_BUCKET) 2>&1; then \
rm -f $$tmpdir/$$lang.new.po; \
else \
if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
......@@ -499,7 +499,7 @@ Makefile: Makefile.in.in $(top_builddir)/config.status @POMAKEFILEDEPS@
$(SHELL) ./config.status
update-RGui: Makefile remove-potcdate.sed RGui.pot-update
@trs=`cd $(srcdir) && ls RGui-*.po 2> /dev/null`; \
@trs=`cd $(srcdir) && ls RGui-*.po 2> $(R_BIT_BUCKET)`; \
if test -n "$${trs}"; then \
for tr in $${trs}; do \
lang=`echo $${tr} | sed -e 's/^RGui-//' -e 's/\.po$$//'`; \
......
......@@ -93,7 +93,7 @@ maintainer-clean: distclean
distdir: $(DISTFILES)
@for f in $(DISTFILES); do \
test -f $(distdir)/$${f} \
|| ln $(srcdir)/$${f} $(distdir)/$${f} 2>/dev/null \
|| ln $(srcdir)/$${f} $(distdir)/$${f} 2>$(R_BIT_BUCKET) \
|| cp -p $(srcdir)/$${f} $(distdir)/$${f}; \
done
@for d in $(SUBDIRS_WITH_NO_BUILD); do \
......
......@@ -10,3 +10,8 @@ R_PKGS_BASE2 = base tools utils grDevices graphics stats grid splines stats4 tcl
R_PKGS_RECOMMENDED = MASS lattice Matrix nlme survival boot cluster codetools foreign KernSmooth rpart class nnet spatial mgcv
# there are dependencies in src/library/Recommended/Makefile*
# which this order respects
# Where to direct output that is usually ignored. Can be defined by an
# variable, but defaults to /dev/null.
R_BIT_BUCKET ?= /dev/null
......@@ -41,7 +41,7 @@ maintainer-clean: distclean
distdir: $(DISTFILES)
@for f in $(DISTFILES); do \
test -f $(distdir)/$${f} \
|| ln $(srcdir)/$${f} $(distdir)/$${f} 2>/dev/null \
|| ln $(srcdir)/$${f} $(distdir)/$${f} 2>$(R_BIT_BUCKET) \
|| cp -p $(srcdir)/$${f} $(distdir)/$${f}; \
done
@for d in $(SUBDIRS); do \
......
......@@ -90,7 +90,7 @@ install install-strip uninstall TAGS info dvi check:
distdir: $(DISTFILES)
@for f in $(DISTFILES); do \
test -f $(distdir)/$${f} \
|| ln $(srcdir)/$${f} $(distdir)/$${f} 2>/dev/null \
|| ln $(srcdir)/$${f} $(distdir)/$${f} 2>$(R_BIT_BUCKET) \
|| cp -p $(srcdir)/$${f} $(distdir)/$${f}; \
done
......
......@@ -89,7 +89,7 @@ uninstall TAGS info dvi check:
distdir: $(DISTFILES)
@for f in $(DISTFILES); do \
test -f $(distdir)/$${f} \
|| ln $(srcdir)/$${f} $(distdir)/$${f} 2>/dev/null \
|| ln $(srcdir)/$${f} $(distdir)/$${f} 2>$(R_BIT_BUCKET) \
|| cp -p $(srcdir)/$${f} $(distdir)/$${f}; \
done
@for d in $(SUBDIRS); do \
......
......@@ -70,7 +70,7 @@ DISTFILES = Makefile.in Makefile.win Rblas.def \
distdir: $(DISTFILES)
@for f in $(DISTFILES); do \
test -f $(distdir)/$${f} \
|| ln $(srcdir)/$${f} $(distdir)/$${f} 2>/dev/null \
|| ln $(srcdir)/$${f} $(distdir)/$${f} 2>$(R_BIT_BUCKET) \
|| cp -p $(srcdir)/$${f} $(distdir)/$${f}; \
done
......@@ -63,7 +63,7 @@ install install-strip uninstall TAGS info dvi check:
distdir: $(DISTFILES)
@for f in $(DISTFILES); do \
test -f $(distdir)/$${f} \
|| ln $(srcdir)/$${f} $(distdir)/$${f} 2>/dev/null \
|| ln $(srcdir)/$${f} $(distdir)/$${f} 2>$(R_BIT_BUCKET) \
|| cp -p $(srcdir)/$${f} $(distdir)/$${f}; \
done
......
......@@ -62,7 +62,7 @@ install install-strip uninstall TAGS info dvi check:
distdir: $(DISTFILES)
@for f in $(DISTFILES); do \
test -f $(distdir)/$${f} \
|| ln $(srcdir)/$${f} $(distdir)/$${f} 2>/dev/null \
|| ln $(srcdir)/$${f} $(distdir)/$${f} 2>$(R_BIT_BUCKET) \
|| cp -p $(srcdir)/$${f} $(distdir)/$${f}; \
done
......
......@@ -96,6 +96,6 @@ install install-strip uninstall TAGS info dvi check:
distdir: $(DISTFILES)
@for f in $(DISTFILES); do \
test -f $(distdir)/$${f} \
|| ln $(srcdir)/$${f} $(distdir)/$${f} 2>/dev/null \
|| ln $(srcdir)/$${f} $(distdir)/$${f} 2>$(R_BIT_BUCKET) \
|| cp -p $(srcdir)/$${f} $(distdir)/$${f}; \
done
......@@ -62,7 +62,7 @@ install install-strip uninstall TAGS info dvi check:
distdir: $(DISTFILES)
@for f in $(DISTFILES); do \
test -f $(distdir)/$${f} \
|| ln $(srcdir)/$${f} $(distdir)/$${f} 2>/dev/null \
|| ln $(srcdir)/$${f} $(distdir)/$${f} 2>$(R_BIT_BUCKET) \
|| cp -p $(srcdir)/$${f} $(distdir)/$${f}; \
done
......
......@@ -69,7 +69,7 @@ install install-strip uninstall TAGS info dvi check:
distdir: $(DISTFILES)
@for f in $(DISTFILES); do \
test -f $(distdir)/$${f} \
|| ln $(srcdir)/$${f} $(distdir)/$${f} 2>/dev/null \
|| ln $(srcdir)/$${f} $(distdir)/$${f} 2>$(R_BIT_BUCKET) \
|| cp -p $(srcdir)/$${f} $(distdir)/$${f}; \
done
@for d in $(SUBDIRS_WITH_NO_BUILD); do \
......
......@@ -65,7 +65,7 @@ install install-strip uninstall TAGS info dvi check:
distdir: $(DISTFILES)
@for f in $(DISTFILES); do \
test -f $(distdir)/$${f} \
|| ln $(srcdir)/$${f} $(distdir)/$${f} 2>/dev/null \
|| ln $(srcdir)/$${f} $(distdir)/$${f} 2>$(R_BIT_BUCKET) \
|| cp -p $(srcdir)/$${f} $(distdir)/$${f}; \
done
......
......@@ -28,5 +28,5 @@ DATA= $(YDATA) $(TABDATA) yearistype.sh
install: $(DATA)
zic -y $(YEARISTYPE) -d ../$(TZDIR) -L /dev/null $(YDATA)
zic -y $(YEARISTYPE) -d ../$(TZDIR) -L $(R_BIT_BUCKET) $(YDATA)
cp iso3166.tab zone.tab ../$(TZDIR)
......@@ -62,7 +62,7 @@ install install-strip uninstall TAGS info dvi check:
distdir: $(DISTFILES)
@for f in $(DISTFILES); do \
test -f $(distdir)/$${f} \
|| ln $(srcdir)/$${f} $(distdir)/$${f} 2>/dev/null \
|| ln $(srcdir)/$${f} $(distdir)/$${f} 2>$(R_BIT_BUCKET) \
|| cp -p $(srcdir)/$${f} $(distdir)/$${f}; \
done
@for d in $(SUBDIRS_WITH_NO_BUILD); do \
......
......@@ -74,7 +74,7 @@ install install-strip uninstall TAGS info dvi check:
distdir: $(DISTFILES)
@for f in $(DISTFILES); do \
test -f $(distdir)/$${f} \
|| ln $(srcdir)/$${f} $(distdir)/$${f} 2>/dev/null \
|| ln $(srcdir)/$${f} $(distdir)/$${f} 2>$(R_BIT_BUCKET) \
|| cp -p $(srcdir)/$${f} $(distdir)/$${f}; \
done
@for d in $(SUBDIRS_WITH_NO_BUILD); do \
......
......@@ -66,7 +66,7 @@ install install-strip uninstall TAGS info dvi check:
distdir: $(DISTFILES)
@for f in $(DISTFILES); do \
test -f $(distdir)/$${f} \
|| ln $(srcdir)/$${f} $(distdir)/$${f} 2>/dev/null \
|| ln $(srcdir)/$${f} $(distdir)/$${f} 2>$(R_BIT_BUCKET) \
|| cp -p $(srcdir)/$${f} $(distdir)/$${f}; \
done
......
......@@ -60,12 +60,12 @@ $(TIMESTAMPS): stamp-R
config.h: stamp-h
stamp-h: $(srcdir)/config.h.in $(top_builddir)/config.status
@cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/config.h
@$(ECHO) timestamp > $@ 2> /dev/null
@$(ECHO) timestamp > $@ 2> $(R_BIT_BUCKET)
$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/stamp-h.in
$(srcdir)/stamp-h.in: @MAINTAINER_MODE_TRUE@ $(top_srcdir)/configure.ac $(top_builddir)/aclocal.m4
@TBD=`cd $(top_builddir); pwd`; \
cd $(top_srcdir) && $(AUTOHEADER) -I $${TBD}
@$(ECHO) timestamp > $@ 2> /dev/null
@$(ECHO) timestamp > $@ 2> $(R_BIT_BUCKET)
Rconfig.h: config.h $(top_srcdir)/tools/GETCONFIG
@$(SHELL) $(top_srcdir)/tools/GETCONFIG > $@
Rversion.h: $(top_srcdir)/VERSION $(top_srcdir)/tools/GETVERSION $(top_builddir)/SVN-REVISION
......@@ -119,7 +119,7 @@ TAGS info dvi check:
distdir: $(DISTFILES)
@for f in $(DISTFILES); do \
test -f $(distdir)/$${f} \
|| ln $(srcdir)/$${f} $(distdir)/$${f} 2>/dev/null \
|| ln $(srcdir)/$${f} $(distdir)/$${f} 2>$(R_BIT_BUCKET) \
|| cp -p $(srcdir)/$${f} $(distdir)/$${f}; \
done
@for d in $(SUBDIRS); do \
......
......@@ -60,27 +60,27 @@ $(R_HOME)/SVN-REVISION: FORCE
fi
ifdef USE_SVNVERSION
@LC_ALL=C svnversion ../.. | sed -n 's/^/Revision: /p' > svn-tmp || rm -f svn-tmp
@grep -v exported svn-tmp > /dev/null || rm -f svn-tmp
@grep -v exported svn-tmp > $(R_BIT_BUCKET) || rm -f svn-tmp
else
@(cd ../..; LC_ALL=C svn info || echo "Revision: unknown") 2> /dev/null \
@(cd ../..; LC_ALL=C svn info || echo "Revision: unknown") 2> $(R_BIT_BUCKET) \
| sed -n '/^Revision/p' > svn-tmp
@if grep unknown svn-tmp > /dev/null ; then \
@if grep unknown svn-tmp > $(R_BIT_BUCKET) ; then \
rm svn-tmp; \
fi
endif
@if test -f svn-tmp ; then \
(cd ../..; LC_ALL=C TZ=GMT svn info || echo "Last Changed Date: unknown") 2> /dev/null \
(cd ../..; LC_ALL=C TZ=GMT svn info || echo "Last Changed Date: unknown") 2> $(R_BIT_BUCKET) \
| sed -n '/^Last Changed Date:/p' | sed 's/[0-9][0-9]:.*//' \
>> svn-tmp ; \
else \
rm -f svn-tmp ; \
fi
@if test -f svn-tmp; then \
if test ! -f $@ || ! cmp svn-tmp $@ > /dev/null ; then\
if test ! -f $@ || ! cmp svn-tmp $@ > $(R_BIT_BUCKET) ; then\
cp svn-tmp $@; \
fi ; \
else \
cp -p $(R_HOME)/SVN-REVISION.bak $@ 2> /dev/null || \
cp -p $(R_HOME)/SVN-REVISION.bak $@ 2> $(R_BIT_BUCKET) || \
(echo "Revision: 00000" > $@; \
echo "Last Changed Date: 2006-00-00" >> $@) ; \
fi
......
......@@ -70,6 +70,6 @@ TAGS info dvi check:
distdir: $(DISTFILES)
@for f in $(DISTFILES); do \
test -f $(distdir)/$${f} \
|| ln $(srcdir)/$${f} $(distdir)/$${f} 2>/dev/null \
|| ln $(srcdir)/$${f} $(distdir)/$${f} 2>$(R_BIT_BUCKET) \
|| cp -p $(srcdir)/$${f} $(distdir)/$${f}; \
done
......@@ -51,11 +51,11 @@ R:
done
@(cd base && $(MAKE) mkdesc)
@$(ECHO) "tools:::.vinstall_package_descriptions_as_RDS(\"$(top_builddir)/library\", \"$(R_PKGS_BASE)\")" | \
R_DEFAULT_PACKAGES=tools LC_ALL=C $(R_EXE) > /dev/null
R_DEFAULT_PACKAGES=tools LC_ALL=C $(R_EXE) > $(R_BIT_BUCKET)
@$(ECHO) "installing parsed NAMESPACE files"
@rm -f $(top_builddir)/library/tools/Meta/nsInfo.rds
@$(ECHO) "tools:::.vinstall_package_namespaces_as_RDS(\"$(top_builddir)/library\", \"$(R_PKGS_BASE)\")" | \
R_DEFAULT_PACKAGES=tools LC_ALL=C $(R_EXE) > /dev/null
R_DEFAULT_PACKAGES=tools LC_ALL=C $(R_EXE) > $(R_BIT_BUCKET)
## do Rdobjects before metadata before help indices
docs:
......@@ -107,14 +107,14 @@ vignettes:
($(ECHO) "tools:::.install_package_vignettes(\"$(srcdir)/$${pkg}\", \"$(top_builddir)/library/$${pkg}\")") | \
R_DEFAULT_PACKAGES="utils,tools" LC_ALL=C \
R_LIBS_USER= R_LIBS_SITE= \
$(R_EXE) > /dev/null; \
$(R_EXE) > $(R_BIT_BUCKET); \
done \
fi
metadata:
@$(ECHO) "building/updating package metadata ..."
@$(ECHO) "tools:::.vinstall_package_indices(\"$(srcdir)\", \"$(top_builddir)/library\", \"$(R_PKGS_BASE)\")" | \
R_DEFAULT_PACKAGES=tools LC_ALL=C $(R_EXE) > /dev/null
R_DEFAULT_PACKAGES=tools LC_ALL=C $(R_EXE) > $(R_BIT_BUCKET)
install: installdirs
@$(ECHO) "installing packages ..."
......@@ -123,7 +123,7 @@ install: installdirs
$(TAR) cf - . | (cd "$(DESTDIR)$(rhome)/library"; $(TAR) xmof -))
@$(ECHO) " building HTML index ..."
@$(ECHO) "utils:::make.packages.html(.Library, verbose=FALSE, docdir=\"$(DESTDIR)${rdocdir}\")" | \
R_DEFAULT_PACKAGES=NULL LC_ALL=C ${R_EXE} >/dev/null
R_DEFAULT_PACKAGES=NULL LC_ALL=C ${R_EXE} >$(R_BIT_BUCKET)
installdirs:
@$(MKINSTALLDIRS) "$(DESTDIR)$(rhome)/library"
install-strip:
......@@ -135,7 +135,7 @@ uninstall:
@$(ECHO) "uninstalling packages ..."
@(cd "$(DESTDIR)$(rhome)/library"; \
for p in $(R_PKGS); do rm -rf $${p}; done)
@rmdir "$(DESTDIR)$(rhome)/library" 2>/dev/null \
@rmdir "$(DESTDIR)$(rhome)/library" 2>$(R_BIT_BUCKET) \
|| $(ECHO) " subdir $(DESTDIR)$(rhome)/library not removed"
install-tests:
......@@ -174,7 +174,7 @@ TAGS info dvi check:
distdir: $(DISTFILES)
@for f in $(DISTFILES); do \
test -f $(distdir)/$${f} \
|| ln $(srcdir)/$${f} $(distdir)/$${f} 2>/dev/null \
|| ln $(srcdir)/$${f} $(distdir)/$${f} 2>$(R_BIT_BUCKET) \
|| cp -p $(srcdir)/$${f} $(distdir)/$${f}; \
done
@for d in $(SUBDIRS); do \
......
......@@ -48,11 +48,11 @@ R:
done
@(cd base && $(MAKE) -f Makefile.win mkdesc)
@$(ECHO) "tools:::.vinstall_package_descriptions_as_RDS(\"$(top_builddir)/library\", \"$(R_PKGS_BASE)\")" | \
R_DEFAULT_PACKAGES=tools LC_ALL=C $(R_EXE) > /dev/null
R_DEFAULT_PACKAGES=tools LC_ALL=C $(R_EXE) > $(R_BIT_BUCKET)
@$(ECHO) "installing parsed NAMESPACE files"
@rm -f $(top_builddir)/library/tools/Meta/nsInfo.rds
@$(ECHO) "tools:::.vinstall_package_namespaces_as_RDS(\"$(top_builddir)/library\", \"$(R_PKGS_BASE)\")" | \
R_DEFAULT_PACKAGES=tools LC_ALL=C $(R_EXE) > /dev/null
R_DEFAULT_PACKAGES=tools LC_ALL=C $(R_EXE) > $(R_BIT_BUCKET)
## do Rdobjects before metadata before help indices
docs:
......@@ -99,14 +99,14 @@ vignettes:
($(ECHO) "tools:::.install_package_vignettes(\"$(srcdir)/$${pkg}\", \"$(top_builddir)/library/$${pkg}\")") | \
R_DEFAULT_PACKAGES="utils,tools" LC_ALL=C \
R_LIBS_USER= R_LIBS_SITE= \
$(R_EXE) > /dev/null; \
$(R_EXE) > $(R_BIT_BUCKET); \
done
@rm -rf .vignettes
metadata:
@$(ECHO) "building/updating package metadata ..."
@$(ECHO) "tools:::.vinstall_package_indices(\"$(srcdir)\", \"$(top_builddir)/library\", \"$(R_PKGS_BASE)\")" | \
R_DEFAULT_PACKAGES=tools LC_ALL=C $(R_EXE) > /dev/null
R_DEFAULT_PACKAGES=tools LC_ALL=C $(R_EXE) > $(R_BIT_BUCKET)
clean:
@for pkg in $(R_PKGS_BASE); do \
......
......@@ -104,7 +104,7 @@ distdir: $(DISTFILES)
fi
@for f in $(DISTFILES) `cd $(srcdir) && ls *.tar.gz`; do \
test -f $(distdir)/$${f} \
|| ln $(srcdir)/$${f} $(distdir)/$${f} 2>/dev/null \
|| ln $(srcdir)/$${f} $(distdir)/$${f} 2>$(R_BIT_BUCKET) \
|| cp -p $(srcdir)/$${f} $(distdir)/$${f}; \
done
......
......@@ -36,7 +36,7 @@ $(top_builddir)/library/$(pkg)/R/$(pkg).rdb: all.R
@$(ECHO) "byte-compiling package '$(pkg)'"
@cat $(srcdir)/makebasedb.R | \
R_COMPILE_PKGS=1 R_COMPILER_SUPPRESS_ALL=1 \
R_DEFAULT_PACKAGES=NULL LC_ALL=C $(R_EXE) > /dev/null
R_DEFAULT_PACKAGES=NULL LC_ALL=C $(R_EXE) > $(R_BIT_BUCKET)
@$(INSTALL_DATA) $(srcdir)/baseloader.R \
$(top_builddir)/library/$(pkg)/R/$(pkg)
......@@ -51,7 +51,7 @@ Rlazy:
@rm -f $(top_builddir)/library/$(pkg)/R/$(pkg).rdx
@WHICH="@WHICH@" $(MAKE) mkRbase
@cat $(srcdir)/makebasedb.R | \
R_DEFAULT_PACKAGES=NULL LC_ALL=C $(R_EXE) > /dev/null
R_DEFAULT_PACKAGES=NULL LC_ALL=C $(R_EXE) > $(R_BIT_BUCKET)
@$(INSTALL_DATA) $(srcdir)/baseloader.R \
$(top_builddir)/library/$(pkg)/R/$(pkg)
......
......@@ -30,7 +30,7 @@ $(top_builddir)/library/$(pkg)/R/$(pkg).rdb: all.R
@$(ECHO) "byte-compiling package '$(pkg)'"
@cat $(srcdir)/makebasedb.R | \
R_COMPILE_PKGS=1 R_COMPILER_SUPPRESS_ALL=1 \
R_DEFAULT_PACKAGES=NULL LC_ALL=C $(R_EXE) > /dev/null
R_DEFAULT_PACKAGES=NULL LC_ALL=C $(R_EXE) > $(R_BIT_BUCKET)
@$(INSTALL_DATA) $(srcdir)/baseloader.R \
$(top_builddir)/library/$(pkg)/R/$(pkg)
......@@ -40,7 +40,7 @@ Rsimple: mkR mkRsimple
Rlazy: mkR mkRsimple
@cat $(srcdir)/makebasedb.R | \
R_DEFAULT_PACKAGES=NULL LC_ALL=C $(R_EXE) > /dev/null
R_DEFAULT_PACKAGES=NULL LC_ALL=C $(R_EXE) > $(R_BIT_BUCKET)
@$(INSTALL_DATA) $(srcdir)/baseloader.R \
$(top_builddir)/library/$(pkg)/R/$(pkg)
......
......@@ -27,7 +27,7 @@ all: Makefile DESCRIPTION
done
@rm -f $(top_builddir)/library/$(pkg)/data/Rdata.*
@$(ECHO) "tools:::data2LazyLoadDB(\"$(pkg)\", compress=3)" | \
R_DEFAULT_PACKAGES=NULL LC_ALL=C $(R_EXE) > /dev/null
R_DEFAULT_PACKAGES=NULL LC_ALL=C $(R_EXE) > $(R_BIT_BUCKET)
@$(INSTALL_DATA) $(srcdir)/data/morley.tab \
$(top_builddir)/library/$(pkg)/data
......
......@@ -21,7 +21,7 @@ all:
done
@rm -f $(top_builddir)/library/$(pkg)/data/Rdata.*
@$(ECHO) "tools:::data2LazyLoadDB(\"$(pkg)\", compress=3)" | \
R_DEFAULT_PACKAGES=NULL LC_ALL=C $(R_EXE) > /dev/null
R_DEFAULT_PACKAGES=NULL LC_ALL=C $(R_EXE) > $(R_BIT_BUCKET)
@$(INSTALL_DATA) $(srcdir)/data/morley.tab \
$(top_builddir)/library/$(pkg)/data
......
......@@ -31,6 +31,6 @@ maintainer-clean: distclean
distdir: $(DISTFILES)
@for f in $(DISTFILES); do \
test -f $(distdir)/$${f} \
|| ln $(srcdir)/$${f} $(distdir)/$${f} 2>/dev/null \
|| ln $(srcdir)/$${f} $(distdir)/$${f} 2>$(R_BIT_BUCKET) \
|| cp -p $(srcdir)/$${f} $(distdir)/$${f}; \
done
......@@ -38,7 +38,7 @@ all: Makefile DESCRIPTION
fi \
fi
@$(ECHO) "tools:::.install_package_description('.', '"$(top_builddir)/library/${pkg}"')" | \
R_DEFAULT_PACKAGES=NULL $(R_EXE) > /dev/null
R_DEFAULT_PACKAGES=NULL $(R_EXE) > $(R_BIT_BUCKET)
mkR: mkR1
......@@ -50,7 +50,7 @@ $(top_builddir)/library/$(pkg)/R/$(pkg).rdb: all.R
@(cat $(srcdir)/R/makeLazyLoad.R; \
$(ECHO) "makeLazyLoading(\"$(pkg)\")") | \
R_COMPILE_PKGS=1 R_COMPILER_SUPPRESS_ALL=1 \
R_DEFAULT_PACKAGES=NULL LC_ALL=C $(R_EXE) > /dev/null
R_DEFAULT_PACKAGES=NULL LC_ALL=C $(R_EXE) > $(R_BIT_BUCKET)
Rsimple: mkR mkRsimple
......@@ -58,6 +58,6 @@ Rlazy: mkR mkRsimple
@$(INSTALL_DATA) all.R $(top_builddir)/library/$(pkg)/R/$(pkg)
@(cat $(srcdir)/R/makeLazyLoad.R; \
$(ECHO) "makeLazyLoading(\"$(pkg)\")") | \
R_DEFAULT_PACKAGES=NULL LC_ALL=C $(R_EXE) > /dev/null
R_DEFAULT_PACKAGES=NULL LC_ALL=C $(R_EXE) > $(R_BIT_BUCKET)
Rlazycomp: mkR mkRsimple mklazycomp
......@@ -22,7 +22,7 @@ all:
$(INSTALL_DATA) all.R $(top_builddir)/library/$(pkg)/R/$(pkg); \
fi
@$(ECHO) "tools:::.install_package_description('.', '"$(top_builddir)/library/${pkg}"')" | \
R_DEFAULT_PACKAGES=NULL $(R_EXE) > /dev/null
R_DEFAULT_PACKAGES=NULL $(R_EXE) > $(R_BIT_BUCKET)
include $(top_srcdir)/share/make/basepkg.mk
......@@ -32,7 +32,7 @@ $(top_builddir)/library/$(pkg)/R/$(pkg).rdb: all.R
@(cat $(srcdir)/R/makeLazyLoad.R; \
$(ECHO) "makeLazyLoading(\"$(pkg)\")") | \
R_COMPILE_PKGS=1 R_COMPILER_SUPPRESS_ALL=1 \
R_DEFAULT_PACKAGES=NULL LC_ALL=C $(R_EXE) > /dev/null
R_DEFAULT_PACKAGES=NULL LC_ALL=C $(R_EXE) > $(R_BIT_BUCKET)
Rsimple: mkR mkRsimple
......@@ -40,6 +40,6 @@ Rlazy: mkR mkRsimple
@$(INSTALL_DATA) all.R $(top_builddir)/library/$(pkg)/R/$(pkg)
@(cat $(srcdir)/R/makeLazyLoad.R; \
$(ECHO) "makeLazyLoading(\"$(pkg)\")") | \
R_DEFAULT_PACKAGES=NULL LC_ALL=C $(R_EXE) > /dev/null
R_DEFAULT_PACKAGES=NULL LC_ALL=C $(R_EXE) > $(R_BIT_BUCKET)