Permalink
Browse files

sort out some make distclean/make uninstall issues

git-svn-id: https://svn.r-project.org/R/trunk@37016 00db46b3-68df-0310-9c12-caf00c1e9a41
  • Loading branch information...
1 parent 8f5abac commit 120ce4a23e49e07bb6f4b7fa80cd7eb06063af3a ripley committed Jan 7, 2006
Showing with 8 additions and 15 deletions.
  1. +1 −4 Makefile.in
  2. +5 −4 doc/Makefile.in
  3. +0 −4 src/main/Makefile.in
  4. +0 −2 src/scripts/Makefile.in
  5. +2 −1 tests/Makefile.in
View
@@ -139,9 +139,6 @@ uninstall:
@for f in $(INSTFILES) $(NON_SVN_INSTFILES); do \
rm -f "$(rhome)/$${f}"; \
done
- @for f in $(INSTFILES); do \
- rm -f "$(rdocdir)/$${f}"; \
- done
@rm -rf "$(Rexecbindir)" "$(Rexeclibdir)"
@rmdir "$(rhome)" 2>/dev/null \
|| echo " dir $(rhome) not removed"
@@ -152,7 +149,7 @@ 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) $(NON_SVN_INSTFILES) ; \
+ rm -f $(INSTFILES); \
fi
distclean: clean
@(for d in $(SUBDIRS); do rsd="$${d} $${rsd}"; done; \
View
@@ -14,7 +14,7 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
INSTFILES = AUTHORS COPYING COPYING.LIB COPYRIGHTS CRAN_mirrors.csv \
KEYWORDS KEYWORDS.db THANKS
DISTFILES = Makefile.in $(INSTFILES) R.aux
-NON_SVN_INSTFILES = FAQ RESOURCES R.1
+NON_SVN_INSTFILES = FAQ RESOURCES
SUBDIRS = html manual
HELP2MAN = $(PERL) $(top_srcdir)/tools/help2man.pl
@@ -57,6 +57,7 @@ install-sources:
done
install-strip: install
+## top-level Makefile installed NEWS in docdir
uninstall:
@echo "uninstalling $(subdir) ..."
@if test -d "$(rdocdir)" \
@@ -65,7 +66,7 @@ uninstall:
for d in $(SUBDIRS); do \
(cd $${d} && $(MAKE) $@) || exit 1; \
done; \
- for f in $(INSTFILES); do \
+ for f in $(INSTFILES) $(NON_SVN_INSTFILES) NEWS; do \
rm -f "$(rdocdir)"/$${f}; \
done; \
rmdir "$(rdocdir)" 2>/dev/null \
@@ -91,7 +92,7 @@ distclean: clean
@if test -f non-tarball ; then \
rm -f $(NON_SVN_INSTFILES) non-tarball ; \
fi
- -@rm -f Makefile
+ -@rm -f Makefile R.1
maintainer-clean: distclean
@@ -100,7 +101,7 @@ svnonly:
touch non-tarball ; \
else \
if test "$(BUILDDIR_IS_SRCDIR)" = no ; then \
- for f in FAQ RESOURCES; do \
+ for f in $(NON_SVN_INSTFILES); do \
$(INSTALL_DATA) $(srcdir)/$${f} "$(rhome)/$(subdir)"; \
done \
fi \
View
@@ -195,11 +195,7 @@ install-strip:
$(MAKE) INSTALL_PROGRAM="${INSTALL_PROGRAM} -s" install
uninstall:
@rm -f "$(Rexecbindir)/exec/R" "$(Rexecbindir)/R.bin"
- @rmdir "$(Rexecbindir)" 2>/dev/null \
- || echo " subdir $(Rexecbindir) not removed"
@rm -f "$(Rexeclibdir)/libR$(DYLIB_EXT)"
- @rmdir "$(Rexeclibdir)" 2>/dev/null \
- || echo " subdir $(Rexeclibdir) not removed"
mostlyclean: clean
clean:
View
@@ -117,8 +117,6 @@ uninstall:
@for f in $(SCRIPTS_S) $(SCRIPTS_B) libtool R; do \
rm -f "$(Rexecbindir)/$${f}"; \
done
- @rmdir "$(Rexecbindir)" 2>/dev/null \
- || echo " subdir $(Rexecbindir) not removed"
@rm -f $(bindir)/R
mostlyclean: clean
View
@@ -394,7 +394,8 @@ clean:
(cd $${d} && $(MAKE) $@); \
done
-@rm -f stamp-R Makedeps Rplot* Rprof.out *.Rd data dumpdata.R \
- reg-plot.ps reg-tests-?.ps R-exts.* R-intro.R
+ reg-plot.ps reg-tests-?.ps R-exts.* R-intro.R R-intro.Rout \
+ FALSE.R FALSE.tex mirrors.html
-@rm -rf anRpackage
distclean: clean
-@for d in $(SUBDIRS); do \

0 comments on commit 120ce4a

Please sign in to comment.