Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

simplify make distclean

git-svn-id: https://svn.r-project.org/R/trunk@38879 00db46b3-68df-0310-9c12-caf00c1e9a41
  • Loading branch information...
commit 4d49f36c2d4aa961c38e60faf6709b86a6c24fc5 1 parent 6d90184
ripley authored
Showing with 11 additions and 14 deletions.
  1. +5 −3 Makefile.in
  2. +3 −5 doc/Makefile.in
  3. +3 −6 doc/html/Makefile.in
View
8 Makefile.in
@@ -100,9 +100,8 @@ install: installdirs svnonly
svnonly:
@if test ! -f "$(srcdir)/doc/FAQ" || test -f non-tarball ; then \
- (cd doc/manual && $(MAKE) front-matter) ; \
+ (cd doc/manual && $(MAKE) front-matter html-non-svn) ; \
touch non-tarball ; \
- touch doc/non-tarball ; \
(cd $(srcdir); LC_ALL=C TZ=GMT svn info || echo "Revision: unknown") 2> /dev/null \
| sed -n -e '/^Revision/p' -e '/^Last Changed Date/'p \
| cut -d' ' -f1,2,3,4 > SVN-REVISION-tmp ; \
@@ -158,7 +157,10 @@ distclean: clean
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 doc/FAQ doc/RESOURCES ; \
+ rm -f $(NON_SVN_INSTFILES) non-tarball doc/FAQ doc/RESOURCES doc/html/resources.html ; \
+ fi
+ @if test "$(BUILDDIR_IS_SRCDIR)" = no ; then \
+ rm -f $(NON_SVN_INSTFILES); \
fi
-@rm -f Makeconf Makefile Makefile.bak Makefrag.* \
config.cache config.log config.status libtool \
View
8 doc/Makefile.in
@@ -89,17 +89,15 @@ distclean: clean
@for d in $(SUBDIRS); do \
(cd $${d} && $(MAKE) $@) || exit 1; \
done
- @if test -f non-tarball ; then \
- rm -f $(NON_SVN_INSTFILES) non-tarball ; \
+ @if test "$(BUILDDIR_IS_SRCDIR)" = no ; then \
+ rm -f $(NON_SVN_INSTFILES); \
fi
-@rm -f Makefile R.1
maintainer-clean: distclean
svnonly:
- @if test ! -f "$(srcdir)/FAQ" ; then \
- touch non-tarball ; \
- else \
+ @if test -f "$(srcdir)/FAQ" ; then \
if test "$(BUILDDIR_IS_SRCDIR)" = no ; then \
for f in $(NON_SVN_INSTFILES); do \
$(INSTALL_DATA) $(srcdir)/$${f} .; \
View
9 doc/html/Makefile.in
@@ -41,10 +41,7 @@ R: Makefile $(OBJECTS) svnonly
done
svnonly:
- @if test ! -f "$(srcdir)/resources.html" || test -f non-tarball ; then \
- (cd ../manual && $(MAKE) html-non-svn) ; \
- touch non-tarball ; \
- else \
+ @if test -f "$(srcdir)/resources.html"; then \
if test "$(BUILDDIR_IS_SRCDIR)" = no ; then \
for f in $(NON_SVN_INSTFILES); do \
$(INSTALL_DATA) $(srcdir)/$${f} . ; \
@@ -101,8 +98,8 @@ distclean: clean
@for d in $(SUBDIRS); do \
(cd $${d} && $(MAKE) $@); \
done
- @if test -f non-tarball ; then \
- rm -f $(NON_SVN_INSTFILES) non-tarball ; \
+ @if test "$(BUILDDIR_IS_SRCDIR)" = no ; then \
+ rm -f $(NON_SVN_INSTFILES); \
fi
-@test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
maintainer-clean: distclean
Please sign in to comment.
Something went wrong with that request. Please try again.