diff --git a/Makefile.comm b/Makefile.comm
index 5155f24..5bc8731 100644
--- a/Makefile.comm
+++ b/Makefile.comm
@@ -67,30 +67,30 @@ fonts:
 .PHONY: pure fonts
 
 mostlyclean:
-	-rm -f $(MOSTLYCLEANFILES)
-	-rm -rf $(MOSTLYCLEANDIRADD)
+	-$(RM) $(MOSTLYCLEANFILES)
+	-$(RM) -r $(MOSTLYCLEANDIRADD)
 	address@hidden test `cd $(srcdir); pwd` = `pwd`; then \
 	  :; \
 	else \
-	  rm -f $(MOSTLYCLEANNOTSRCDIRADD); \
+	  $(RM) $(MOSTLYCLEANNOTSRCDIRADD); \
 	fi
 
 clean: mostlyclean
-	-rm -f $(CLEANFILES)
+	-$(RM) $(CLEANFILES)
 
 distclean: clean
-	-rm -f $(DISTCLEANFILES)
+	-$(RM) $(DISTCLEANFILES)
 	address@hidden test `cd $(srcdir); pwd` = `pwd`; then \
 	  :; \
 	else \
-	  rm -f $(YTABC) $(YTABH); \
+	  $(RM) $(YTABC) $(YTABH); \
 	fi
 
 realclean: distclean
-	-rm -f $(REALCLEANFILES)
+	-$(RM) $(REALCLEANFILES)
 
 extraclean: distclean
-	-rm -f \#* *~ =* core junk grot old temp tmp tem *.new *.old *.orig
+	-$(RM) \#* *~ =* core junk grot old temp tmp tem *.new *.old *.orig
 
 .SUFFIXES:
 .SUFFIXES: .o .obj .cpp .c .y .man .n
@@ -117,7 +117,7 @@ extraclean: distclean
 	-test -f y.tab.c && mv y.tab.c y_tab.c
 	sed "s/^#line \(.*\) \"y.tab.c\"/#line \1 \"$(YTABC)\"/" \
 	  < y_tab.c > $(YTABC)
-	-rm -f y_tab.c
+	-$(RM) y_tab.c
 	test -z "$(YTABH)" || mv y_tab.h $(YTABH)
 
 # The next rule is needed for make of Solaris 2.5.1 to override its
@@ -136,7 +136,7 @@ extraclean: distclean
 
 .man.n:
 	@echo Making $@ from $<
-	@-rm -f $@
+	@-$(RM) $@
 	@LC_ALL=C sed -e "s|@APPRESDIR@|$(appresdir)|g" \
 	-e "s|@BINDIR@|$(bindir)|g" \
 	-e "s|@BROKEN_SPOOLER_FLAGS@|$(BROKEN_SPOOLER_FLAGS)|g" \
@@ -178,7 +178,7 @@ install_man:
 	for p in $$pages; do \
 	 prog=`basename $$p .n`; \
 	 target=$(DESTDIR)$(man1dir)/$(NAMEPREFIX)$$prog.$(man1ext); \
-	 rm -f $$target; \
+	 $(RM) $$target; \
 	 echo $(INSTALL_DATA) $$p $$target; \
 	 $(INSTALL_DATA) $$p $$target; \
 	done
@@ -186,7 +186,7 @@ install_man:
 	@-pages="$(MAN5)"; \
 	for p in $$pages; do \
 	 target=$(DESTDIR)$(man5dir)/`basename $$p .n`.$(man5ext); \
-	 rm -f $$target; \
+	 $(RM) $$target; \
 	 echo $(INSTALL_DATA) $$p $$target; \
 	 $(INSTALL_DATA) $$p $$target; \
 	done
@@ -194,7 +194,7 @@ install_man:
 	@-pages="$(MAN7)"; \
 	for p in $$pages; do \
 	 target=$(DESTDIR)$(man7dir)/`basename $$p .n`.$(man7ext); \
-	 rm -f $$target; \
+	 $(RM) $$target; \
 	 echo $(INSTALL_DATA) $$p $$target; \
 	 $(INSTALL_DATA) $$p $$target; \
 	done
@@ -203,32 +203,32 @@ install_man:
 uninstall_man:
 	@-pages="$(MAN1)"; \
 	for p in $$pages; do \
-	 target=$(DESTDIR)$(man1dir)/$(NAMEPREFIX)`basename $$p .n`.$(man1ext); \
-	 echo rm -f $$target; \
-	 rm -f $$target; \
+		target=$(DESTDIR)$(man1dir)/$(NAMEPREFIX)`basename $$p .n`.$(man1ext);\
+		echo $(RM) $$target;\
+		$(RM) $$target;\
 	done
 	@-pages="$(MAN5)"; \
 	for p in $$pages; do \
-	 target=$(DESTDIR)$(man5dir)/`basename $$p .n`.$(man5ext); \
-	 echo rm -f $$target; \
-	 rm -f $$target; \
+		target=$(DESTDIR)$(man5dir)/`basename $$p .n`.$(man5ext);\
+		echo $(RM) $$target;\
+		$(RM) $$target;\
 	done
 	@-pages="$(MAN7)"; \
 	for p in $$pages; do \
-	 target=$(DESTDIR)$(man7dir)/`basename $$p .n`.$(man7ext); \
-	 echo rm -f $$target; \
-	 rm -f $$target; \
+		target=$(DESTDIR)$(man7dir)/`basename $$p .n`.$(man7ext);\
+		echo $(RM) $$target;\
+		$(RM) $$target;\
 	done
 
 .PHONY: install_prog
 install_prog:
 	-test -d $(DESTDIR)$(bindir) || $(mkinstalldirs) $(DESTDIR)$(bindir)
-	rm -f $(DESTDIR)$(bindir)/$(NAMEPREFIX)$(PROG)
+	$(RM) $(DESTDIR)$(bindir)/$(NAMEPREFIX)$(PROG)
 	$(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(bindir)/$(NAMEPREFIX)$(PROG)
 
 .PHONY: uninstall_prog
 uninstall_prog:
-	-rm -f $(DESTDIR)$(bindir)/$(NAMEPREFIX)$(PROG)	
+	-$(RM) $(DESTDIR)$(bindir)/$(NAMEPREFIX)$(PROG)
 
 .PHONY: install_dev
 install_dev:
@@ -266,7 +266,7 @@ install_dev:
 	fi
 	-test -z "$(DEVFILES)" \
 	  || for f in ""$(DEVFILES); do \
-	       rm -f $(DESTDIR)$(fontsubdir)/$$f; \
+	       $(RM) $(DESTDIR)$(fontsubdir)/$$f; \
 	       if test -f $$f; then \
 		 $(INSTALL_DATA) $$f $(DESTDIR)$(fontsubdir)/$$f; \
 	       else \
@@ -275,12 +275,12 @@ install_dev:
 	     done
 	-test -z "$(OLDDEVFILES)" \
 	  || for f in ""$(OLDDEVFILES); do \
-	       rm -f $(DESTDIR)$(oldfontsubdir)/$$f; \
+	       $(RM) $(DESTDIR)$(oldfontsubdir)/$$f; \
 	       $(INSTALL_DATA) $(srcdir)/old/$$f $(DESTDIR)$(oldfontsubdir)/$$f; \
 	     done
 	-test -z "$(DEVSCRIPTS)" \
 	  || for f in ""$(DEVSCRIPTS); do \
-	       rm -f $(DESTDIR)$(fontsubdir)/$$f; \
+	       $(RM) $(DESTDIR)$(fontsubdir)/$$f; \
 	       if test -f $$f; then \
 		 $(INSTALL_SCRIPT) $$f $(DESTDIR)$(fontsubdir)/$$f; \
 	       else \
@@ -290,24 +290,25 @@ install_dev:
 
 .PHONY: uninstall_dev
 uninstall_dev:
-	-test -z "$(DEVFILES)$(DEVSCRIPTS)" \
-	  || for f in ""$(DEVFILES) $(DEVSCRIPTS); do \
-	       rm -f $(DESTDIR)$(fontsubdir)/$$f; \
-	     done
-	-test -z "$(OLDDEVFILES)" \
-	  || for f in ""$(OLDDEVFILES); do \
-	       rm -f $(DESTDIR)$(oldfontsubdir)/$$f; \
-	     done
-	-test -d $(DESTDIR)$(fontsubdir)/generate \
-	  && rmdir $(DESTDIR)$(fontsubdir)/generate
-	-test -d $(DESTDIR)$(fontsubdir)/enc \
-	  && rmdir $(DESTDIR)$(fontsubdir)/enc
-	-test -d $(DESTDIR)$(fontsubdir)/map \
-	  && rmdir $(DESTDIR)$(fontsubdir)/map
-	-test -d $(DESTDIR)$(fontsubdir)/util \
-	  && rmdir $(DESTDIR)$(fontsubdir)/util
-	-rmdir $(DESTDIR)$(fontsubdir)
-	-rmdir $(DESTDIR)$(oldfontsubdir)
+	-test -z "$(DEVFILES)$(DEVSCRIPTS)" ||\
+		for f in ""$(DEVFILES) $(DEVSCRIPTS); do \
+			$(RM) $(DESTDIR)$(fontsubdir)/$${f};\
+		done
+	-test -z "$(OLDDEVFILES)" ||\
+		for f in ""$(OLDDEVFILES); do \
+			$(RM) $(DESTDIR)$(oldfontsubdir)/$${f};\
+		done
+	-d="$(DESTDIR)$(fontsubdir)/generate";\
+		if test -d "$${d}"; then $(rmdir) "$${d}"; fi
+	-d="$(DESTDIR)$(fontsubdir)/enc";\
+		if test -d "$${d}"; then $(rmdir) "$${d}"; fi
+	-d="$(DESTDIR)$(fontsubdir)/map";\
+		if test -d "$${d}"; then $(rmdir) "$${d}"; fi
+	-d="$(DESTDIR)$(fontsubdir)/util";\
+		if test -d "$${d}"; then $(rmdir) "$${d}"; fi
+	-$(rmdir) $(DESTDIR)$(fontsubdir)
+	-d="$(DESTDIR)$(oldfontsubdir)";\
+		if test -d "$${d}"; then $(rmdir) "$${d}"; fi
 
 .PHONY: depend_src
 depend_src: depend.temp
@@ -336,7 +337,7 @@ TAGS_src:
 
 # This rule is only considered for the subdir_Makefile target.
 Makefile:
-	-rm -f Makefile
+	-$(RM) Makefile
 	echo srcdir=$(srcdir) >>Makefile
 	echo VPATH=$(VPATH) >>Makefile
 	cat $(MAKEFILEPARTS) /dev/null >>Makefile
diff --git a/Makefile.in b/Makefile.in
index f9da331..3f14c45 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -264,15 +264,44 @@ man5dir=$(manroot)/man$(man5ext)
 man7ext=7
 man7dir=$(manroot)/man$(man7ext)
 
+# `dist' target is disallowed in some `configure' combinations.
address@hidden@
+
+# The configure script checks whether the user wants the info documentation.
+# For the repo version this mechanism also suppresses building via `makeinfo'.
address@hidden@
address@hidden@
address@hidden@
+
 # The configure script checks whether all necessary utility programs for
 # grohtml are available -- only then we can build the HTML documentation.
address@hidden@
address@hidden@
address@hidden@
address@hidden@
address@hidden@
address@hidden@
address@hidden@
address@hidden@
 
 # The configure script also checks whether all necessary utility programs
 # for pdfroff are available -- only then we can build PDF documentation.
 address@hidden@
 address@hidden@
address@hidden@
address@hidden@
address@hidden@
address@hidden@
+
+# `other' documentation, e.g., `meref.me' and `pic.ms', as well as their
+# generated counterparts..
address@hidden@
address@hidden@
address@hidden@
+
+# `examples' -- a generic switch, but the generated examples are furtherly
+# subdivided to catch HTML and PDF production availability.
address@hidden@
address@hidden@
address@hidden@
 
 # All the previous installation directories, when used, are prefixed with
 # $(DESTDIR) during install and uninstall, to support staged installations.
@@ -438,6 +467,12 @@ address@hidden@
 # Sed script to deal with OS dependencies in sh scripts.
 SH_DEPS_SED_SCRIPT=$(top_builddir)/arch/misc/shdeps.sed
 
+# Not all make programs have $(RM)+ predefined.
+RM=rm -f
+
+# And we want `rmdir -p' everywhere, too.
+rmdir=rmdir
+
 # The program to create directory hierarchies.
 mkinstalldirs= $(SHELL) $(top_srcdir)/mkinstalldirs
 
@@ -493,6 +528,8 @@ MDEFINES=\
   "PURIFY=$(PURIFY)" \
   "PURIFYCCFLAGS=$(PURIFYCCFLAGS)" \
   "RANLIB=$(RANLIB)" \
+  "RM=$(RM)" \
+  "rmdir=$(rmdir)" \
   "RT_SEP=$(RT_SEP)" \
   "SH_SEP=$(SH_SEP)" \
   "SHELL=$(SHELL)" \
@@ -534,10 +571,27 @@ MDEFINES=\
   "libprogramdir=$(libprogramdir)" \
   "localfontdir=$(localfontdir)" \
   "localtmacdir=$(localtmacdir)" \
-  "make_html=$(make_html)" \
-  "make_install_html=$(make_install_html)" \
+  "make_infodoc=$(make_infodoc)" \
+  "make_install_infodoc=$(make_install_infodoc)" \
+  "make_uninstall_infodoc=$(make_uninstall_infodoc)" \
+  "make_htmldoc=$(make_htmldoc)" \
+  "make_install_htmldoc=$(make_install_htmldoc)" \
+  "make_uninstall_htmldoc=$(make_uninstall_htmldoc)" \
+  "make_htmlexamples=$(make_htmlexamples)" \
+  "make_install_htmlexamples=$(make_install_htmlexamples)" \
+  "make_uninstall_htmlexamples=$(make_uninstall_htmlexamples)" \
   "make_pdfdoc=$(make_pdfdoc)" \
   "make_install_pdfdoc=$(make_install_pdfdoc)" \
+  "make_uninstall_pdfdoc=$(make_uninstall_pdfdoc)" \
+  "make_pdfexamples=$(make_pdfexamples)" \
+  "make_install_pdfexamples=$(make_install_pdfexamples)" \
+  "make_uninstall_pdfexamples=$(make_uninstall_pdfexamples)" \
+  "make_otherdoc=$(make_otherdoc)" \
+  "make_install_otherdoc=$(make_install_otherdoc)" \
+  "make_uninstall_otherdoc=$(make_uninstall_otherdoc)" \
+  "make_examples=$(make_examples)" \
+  "make_install_examples=$(make_install_examples)" \
+  "make_uninstall_examples=$(make_uninstall_examples)" \
   "man1dir=$(man1dir)" \
   "man1ext=$(man1ext)" \
   "man5dir=$(man5dir)" \
@@ -830,8 +884,12 @@ $(INCDIRS) $(PROGDEPDIRS) $(SHPROGDIRS) $(OTHERDIRS): FORCE
 
 .PHONY: dist
 dist:
-	-rm -fr tmp
-	rm -f groff-$(version)$(revision).tar.gz
+	if test "${doc_dist_target_ok}" != yes; then \
+	  echo "This configuration is not applicable to \`dist' target";\
+	  exit 1;\
+	fi
+	-$(RM) -r tmp
+	$(RM) groff-$(version)$(revision).tar.gz
 	mkdir tmp
 	for d in $(DISTDIRS); do \
 	  $(mkinstalldirs) tmp/$$d; \
@@ -852,12 +910,12 @@ dist:
 	     $(MAKE) -f $(top_builddir)/$$d/Makefile extraclean; \
 	   fi); \
 	done
-	rm -f tmp/Makefile
+	$(RM) tmp/Makefile
 	cp Makefile.init tmp/Makefile
 	mv tmp groff-$(version)$(revision)
 	tar cfh - groff-$(version)$(revision) | \
 	  gzip -c >groff-$(version)$(revision).tar.gz
-	rm -fr groff-$(version)$(revision)
+	$(RM) -r groff-$(version)$(revision)
 
 # $(PROGDIRS): libgroff
 # grops grotty grodvi: libdriver
@@ -887,7 +945,7 @@ install:
 	@$(ENVSETUP); $(MAKE) $(MAKE_K_FLAG) $(MDEFINES) \
 	  do=do_install $(dodirs)
 	cd $(DESTDIR)$(dataprogramdir); \
-	rm -f current; \
+	$(RM) current; \
 	$(LN_S) $(version)$(revision) current
 
 .PHONY: uninstall
@@ -896,14 +954,21 @@ uninstall: uninstall_sub uninstall_dirs
 .PHONY: uninstall_dirs
 # Use `rmdir' here so that the directories are only removed if they are empty.
 uninstall_dirs:
-	-rm -f $(dataprogramdir)/current
-	-rmdir $(man1dir) $(man5dir) $(man7dir) $(manroot) \
-	  $(tmacdir) $(systemtmacdir) $(localtmacdir) \
-	  $(fontdir) $(localfontdir) $(oldfontdir) $(bindir) \
-	  $(datasubdir) $(dataprogramdir) $(infodir) \
-	  $(exampledir) $(htmldocdir) $(pdfdocdir) $(docdir) \
-	  $(libprogramdir) $(libdir) \
-	  $(datadir)/doc/groff $(datadir)/doc $(datadir) 2>/dev/null || :
+	-$(RM) $(DESTDIR)$(dataprogramdir)/current
+	-$(rmdir) $(DESTDIR)$(man1dir) $(DESTDIR)$(man5dir) \
+			$(DESTDIR)$(man7dir) $(DESTDIR)$(manroot) \
+		$(DESTDIR)$(tmacdir) $(DESTDIR)$(systemtmacdir) \
+			$(DESTDIR)$(localtmacdir) \
+		$(DESTDIR)$(fontdir) $(DESTDIR)$(localfontdir) \
+			$(DESTDIR)$(oldfontdir) \
+		$(DESTDIR)$(bindir) $(DESTDIR)$(datasubdir) \
+			$(DESTDIR)$(dataprogramdir) \
+			$(DESTDIR)$(libprogramdir) $(DESTDIR)$(libdir) \
+		$(DESTDIR)$(infodir) $(DESTDIR)$(exampledir) \
+			$(DESTDIR)$(htmldocdir) $(DESTDIR)$(pdfdocdir) \
+			$(DESTDIR)$(docdir) $(DESTDIR)$(datadir)/doc/groff \
+			$(DESTDIR)$(datadir)/doc \
+		$(DESTDIR)$(datadir) 2>/dev/null || :
 
 .PHONY: check
 check:
@@ -932,7 +997,7 @@ check:
 #	@echo "## All variables above are generated by configure.  Do not edit! ##" >> site.tmp
 #	@test ! -f site.exp \
 #	  || sed '1,/^## All variables above are.*##/ d' site.exp >> site.tmp
-#	@-rm -f site.bak
+#	@-$(RM) site.bak
 #	@test ! -f site.exp || mv site.exp site.bak
 #	@mv site.tmp site.exp
 
diff --git a/Makefile.sub b/Makefile.sub
index cb6df43..aa9afd9 100644
--- a/Makefile.sub
+++ b/Makefile.sub
@@ -52,7 +52,7 @@ M4MACROS=\
 distfiles: configure
 
 $(srcdir)/configure: configure.ac $(srcdir)/aclocal.m4
-	cd $(srcdir) && autoconf && rm -rf autom4te.cache
+	cd $(srcdir) && autoconf && $(RM) -r autom4te.cache
 
 $(srcdir)/aclocal.m4: $(M4MACROS)
 	cd $(srcdir) && aclocal -I m4
diff --git a/configure.ac b/configure.ac
index 72fe2fc..af5ce27 100644
--- a/configure.ac
+++ b/configure.ac
@@ -69,6 +69,7 @@ GROFF_PERL
 GROFF_PRINT
 AC_PROG_EGREP
 GROFF_PROG_YACC
+GROFF_DOC_CHECK
 GROFF_MAKEINFO
 AC_PROG_RANLIB
 GROFF_INSTALL_SH
diff --git a/contrib/chem/Makefile.sub b/contrib/chem/Makefile.sub
index 93f3e19..fb3c532 100644
--- a/contrib/chem/Makefile.sub
+++ b/contrib/chem/Makefile.sub
@@ -32,16 +32,14 @@ MOSTLYCLEANADD=\
   examples/README \
   examples/122/README
 
-# not all make programs have $(RM) predefined.
-RM=rm -f
-
-all: README examples/README examples/122/README \
-     chem \
-     $(MAN1)
+all: README chem $(MAN1) $(make_examples)
 
 README: $(srcdir)/README.txt
 	sed -e "s|@g@|$(g)|g" $? >$@
 
+.PHONY: examples
+examples: examples/README examples/122/README
+
 examples/README: $(srcdir)/examples/README.txt
 	-test -d examples || $(mkinstalldirs) examples
 	sed -e "s|@g@|$(g)|g" $? >$@
@@ -62,46 +60,47 @@ chem: $(srcdir)/chem.pl $(SH_DEPS_SED_SCRIPT)
 	  $(srcdir)/chem.pl >$@
 	chmod +x $@
 
-install_data: chem \
-              README examples/README examples/122/README \
-              $(srcdir)/chem.pic \
-              $(srcdir)/examples/*.chem $(srcdir)/examples/122/*.chem
+install_data: install_always $(make_install_examples)
+install_always: chem README $(srcdir)/chem.pic
 	-test -d $(DESTDIR)$(bindir) || $(mkinstalldirs) $(DESTDIR)$(bindir)
-	$(RM) $(DESTDIR)$(bindir)/$(g)chem
+	-$(RM) $(DESTDIR)$(bindir)/$(g)chem
 	$(INSTALL_SCRIPT) chem $(DESTDIR)$(bindir)/$(g)chem
-	-test -d $(DESTDIR)$(datasubdir)/pic \
-          || $(mkinstalldirs) $(DESTDIR)$(datasubdir)/pic
-	$(RM) $(DESTDIR)$(datasubdir)/pic/chem.pic
+	-test -d $(DESTDIR)$(datasubdir)/pic ||\
+		$(mkinstalldirs) $(DESTDIR)$(datasubdir)/pic
+	-$(RM) $(DESTDIR)$(datasubdir)/pic/chem.pic
 	$(INSTALL_DATA) $(srcdir)/chem.pic \
-          $(DESTDIR)$(datasubdir)/pic/chem.pic
-	-test -d $(DESTDIR)$(exampledir)/chem \
-          || $(mkinstalldirs) $(DESTDIR)$(exampledir)/chem
-	-test -d $(DESTDIR)$(exampledir)/chem/122 \
-          || $(mkinstalldirs) $(DESTDIR)$(exampledir)/chem/122
-	-$(RM) $(DESTDIR)$(exampledir)/chem/*
+		$(DESTDIR)$(datasubdir)/pic/chem.pic
+
+install_examples: install_always examples
+	-test -d $(DESTDIR)$(exampledir)/chem ||\
+		$(mkinstalldirs) $(DESTDIR)$(exampledir)/chem
+	-test -d $(DESTDIR)$(exampledir)/chem/122 ||\
+		$(mkinstalldirs) $(DESTDIR)$(exampledir)/chem/122
+	-find $(DESTDIR)$(exampledir)/chem -type f -exec $(RM) '{}' ';'
 	$(INSTALL_DATA) examples/README \
-          $(DESTDIR)$(exampledir)/chem/README
+		$(DESTDIR)$(exampledir)/chem/README
 	for i in $(srcdir)/examples/*.chem; do \
-          n=`echo $$i | sed 's|$(srcdir)/examples/||g'`; \
-          $(INSTALL_DATA) $$i $(DESTDIR)$(exampledir)/chem/$$n; \
-        done
-	-$(RM) $(DESTDIR)$(exampledir)/chem/122/*
+		n=`echo $$i | sed 's|$(srcdir)/examples/||g'`;\
+		$(INSTALL_DATA) $$i $(DESTDIR)$(exampledir)/chem/$$n;\
+	done
 	$(INSTALL_DATA) examples/122/README \
-          $(DESTDIR)$(exampledir)/chem/122/README
+		$(DESTDIR)$(exampledir)/chem/122/README
 	for i in $(srcdir)/examples/122/*.chem; do \
-          n=`echo $$i | sed 's|$(srcdir)/examples/122/||g'`; \
-          $(INSTALL_DATA) $$i $(DESTDIR)$(exampledir)/chem/122/$$n; \
-        done
-
-uninstall_sub:
-	$(RM) $(DESTDIR)$(bindir)/chem
-	$(RM) $(DESTDIR)$(datasubdir)/pic/chem.pic
-	-rmdir $(DESTDIR)$(datasubdir)/pic
-	$(RM) $(DESTDIR)$(exampledir)/chem/122/*
-	-rmdir $(DESTDIR)$(exampledir)/chem/122
-	$(RM) $(DESTDIR)$(exampledir)/chem/*
-	-rmdir $(DESTDIR)$(exampledir)/chem
-	-rmdir $(DESTDIR)$(exampledir)
+		n=`echo $$i | sed 's|$(srcdir)/examples/122/||g'`;\
+		$(INSTALL_DATA) $$i $(DESTDIR)$(exampledir)/chem/122/$$n;\
+	done
+
+uninstall_sub: uninstall_always $(make_uninstall_examples)
+uninstall_always:
+	-$(RM) $(DESTDIR)$(bindir)/chem
+	-$(RM) $(DESTDIR)$(datasubdir)/pic/chem.pic
+	-$(rmdir) $(DESTDIR)$(datasubdir)/pic
+
+uninstall_examples: uninstall_always
+	-$(RM) $(DESTDIR)$(exampledir)/chem/122/*
+	-$(rmdir) $(DESTDIR)$(exampledir)/chem/122
+	-$(RM) $(DESTDIR)$(exampledir)/chem/*
+	-$(rmdir) $(DESTDIR)$(exampledir)/chem
 
 ########################################################################
 # Emacs settings
diff --git a/contrib/eqn2graph/Makefile.sub b/contrib/eqn2graph/Makefile.sub
index 0a3267a..ae53f03 100644
--- a/contrib/eqn2graph/Makefile.sub
+++ b/contrib/eqn2graph/Makefile.sub
@@ -24,7 +24,7 @@ MOSTLYCLEANADD=eqn2graph
 all: eqn2graph
 
 eqn2graph: eqn2graph.sh
-	rm -f $@; \
+	$(RM) $@; \
 	sed -e "s|@g@|$(g)|g" \
 	    -e "s|@VERSION@|$(version)$(revision)|" \
 	    -e $(SH_SCRIPT_SED_CMD) $(srcdir)/eqn2graph.sh >$@; \
@@ -32,8 +32,8 @@ eqn2graph: eqn2graph.sh
 
 install_data: eqn2graph
 	-test -d $(DESTDIR)$(bindir) || $(mkinstalldirs) $(DESTDIR)$(bindir)
-	-rm -f $(DESTDIR)$(bindir)/eqn2graph
+	-$(RM) $(DESTDIR)$(bindir)/eqn2graph
 	$(INSTALL_SCRIPT) eqn2graph $(DESTDIR)$(bindir)/eqn2graph
 
 uninstall_sub:
-	-rm -f $(DESTDIR)$(bindir)/eqn2graph
+	-$(RM) $(DESTDIR)$(bindir)/eqn2graph
diff --git a/contrib/gdiffmk/Makefile.sub b/contrib/gdiffmk/Makefile.sub
index c3179ff..9bdbe17 100644
--- a/contrib/gdiffmk/Makefile.sub
+++ b/contrib/gdiffmk/Makefile.sub
@@ -30,16 +30,16 @@ MOSTLYCLEANADD=gdiffmk tests/runtests
 all: gdiffmk
 
 gdiffmk: gdiffmk.sh
-	rm -f $@;						\
+	$(RM) $@;						\
 	sed -e "s|@BINDIR@|$(bindir)|g"				\
 	    -e "s|@VERSION@|$(version)$(revision)|g"		\
 	    -e $(SH_SCRIPT_SED_CMD)  $(srcdir)/gdiffmk.sh  >$@;	\
 	chmod +x $@
 
 install_data: gdiffmk
-	-test -d $(DESTDIR)$(bindir)  ||  $(mkinstalldirs) $(DESTDIR)$(bindir)
-	-rm -f $(DESTDIR)$(bindir)/gdiffmk
+	-test -d $(DESTDIR)$(bindir) || $(mkinstalldirs) $(DESTDIR)$(bindir)
+	-$(RM) $(DESTDIR)$(bindir)/gdiffmk
 	$(INSTALL_SCRIPT) gdiffmk $(DESTDIR)$(bindir)/gdiffmk
 
 uninstall_sub:
-	-rm -f $(DESTDIR)$(bindir)/gdiffmk
+	-$(RM) $(DESTDIR)$(bindir)/gdiffmk
diff --git a/contrib/glilypond/Makefile.sub b/contrib/glilypond/Makefile.sub
index 0ff5e3e..d0c7e07 100644
--- a/contrib/glilypond/Makefile.sub
+++ b/contrib/glilypond/Makefile.sub
@@ -30,12 +30,8 @@ MAN1=glilypond.n
 
 MOSTLYCLEANADD=glilypond $(MAN1)
 
-# not all make programs have $(RM) predefined.
-RM=rm -f
-
 all: glilypond
 
-
 # files going to lib directory `$(glilypond_dir)'
 
 GLILYPOND_LIB=$(srcdir)/subs.pl \
@@ -44,7 +40,6 @@ GLILYPOND_LIB=$(srcdir)/subs.pl \
 
 GLILYPOND_LIB_=`echo $(GLILYPOND_LIB) | sed 's|$(srcdir)/||g'`
 
-
 # create perl executable `glilypond', being stored into `bindir'
 
 glilypond: $(srcdir)/glilypond.pl
@@ -56,26 +51,24 @@ glilypond: $(srcdir)/glilypond.pl
 		$(srcdir)/glilypond.pl >$@
 	chmod +x $@
 
-
 install_data: glilypond $(GLILYPOND_LIB)
-	-test -d $(DESTDIR)$(bindir) \
-		|| $(mkinstalldirs) $(DESTDIR)$(bindir)
+	-test -d $(DESTDIR)$(bindir) ||\
+		$(mkinstalldirs) $(DESTDIR)$(bindir)
 	$(RM) $(DESTDIR)$(bindir)/glilypond
 	$(INSTALL_SCRIPT) glilypond $(DESTDIR)$(bindir)/glilypond
-	-test -d $(DESTDIR)$(glilypond_dir) \
-		|| $(mkinstalldirs) $(DESTDIR)$(glilypond_dir)
+	-test -d $(DESTDIR)$(glilypond_dir) ||\
+		$(mkinstalldirs) $(DESTDIR)$(glilypond_dir)
 	for f in $(GLILYPOND_LIB_); do \
-		$(RM) $(DESTDIR)$(glilypond_dir)/$$f; \
-		$(INSTALL_SCRIPT) $(srcdir)/$$f $(DESTDIR)$(glilypond_dir)/$$f; \
+		$(RM) $(DESTDIR)$(glilypond_dir)/$$f;\
+		$(INSTALL_SCRIPT) $(srcdir)/$$f $(DESTDIR)$(glilypond_dir)/$$f;\
 	done
 
-
 uninstall_sub:
-	$(RM) $(DESTDIR)$(bindir)/glilypond;
-	for f in $(GLILYPOND_); do \
-		$(RM) $(DESTDIR)$(glilypond_dir)/$$f; \
+	-$(RM) $(DESTDIR)$(bindir)/glilypond;
+	-for f in $(GLILYPOND_LIB_); do \
+		$(RM) $(DESTDIR)$(glilypond_dir)/$$f;\
 	done
-	-rmdir $(DESTDIR)$(glilypond_dir)
+	-$(rmdir) $(DESTDIR)$(glilypond_dir)
 
 ########################################################################
 # Emacs settings
diff --git a/contrib/gperl/Makefile.sub b/contrib/gperl/Makefile.sub
index 02f24f4..7053176 100644
--- a/contrib/gperl/Makefile.sub
+++ b/contrib/gperl/Makefile.sub
@@ -30,9 +30,6 @@ MAN1=gperl.n
 
 MOSTLYCLEANADD=gperl $(MAN1)
 
-# not all make programs have $(RM) predefined.
-RM=rm -f
-
 all: gperl
 
 gperl: gperl.pl
@@ -47,13 +44,12 @@ gperl: gperl.pl
 .PHONY: install_data
 install_data: gperl
 	-test -d $(DESTDIR)$(bindir) || $(mkinstalldirs) $(DESTDIR)$(bindir)
-	$(RM) $(DESTDIR)$(bindir)/gperl
+	-$(RM) $(DESTDIR)$(bindir)/gperl
 	$(INSTALL_SCRIPT) gperl $(DESTDIR)$(bindir)/gperl
 
 .PHONY: uninstall_sub
 uninstall_sub:
-	$(RM) $(DESTDIR)$(bindir)/gperl
-
+	-$(RM) $(DESTDIR)$(bindir)/gperl
 
 ########################################################################
 # Emacs settings
diff --git a/contrib/grap2graph/Makefile.sub b/contrib/grap2graph/Makefile.sub
index dec9f6d..d16c8f3 100644
--- a/contrib/grap2graph/Makefile.sub
+++ b/contrib/grap2graph/Makefile.sub
@@ -24,7 +24,7 @@ MOSTLYCLEANADD=grap2graph
 all: grap2graph
 
 grap2graph: grap2graph.sh
-	rm -f $@; \
+	$(RM) $@; \
 	sed -e "s|@g@|$(g)|g" \
 	    -e "s|@VERSION@|$(version)$(revision)|" \
 	    -e $(SH_SCRIPT_SED_CMD) $(srcdir)/grap2graph.sh >$@; \
@@ -32,8 +32,8 @@ grap2graph: grap2graph.sh
 
 install_data: grap2graph
 	-test -d $(DESTDIR)$(bindir) || $(mkinstalldirs) $(DESTDIR)$(bindir)
-	-rm -f $(DESTDIR)$(bindir)/grap2graph
+	-$(RM) $(DESTDIR)$(bindir)/grap2graph
 	$(INSTALL_SCRIPT) grap2graph $(DESTDIR)$(bindir)/grap2graph
 
 uninstall_sub:
-	-rm -f $(DESTDIR)$(bindir)/grap2graph
+	-$(RM) $(DESTDIR)$(bindir)/grap2graph
diff --git a/contrib/groffer/Makefile.sub b/contrib/groffer/Makefile.sub
index 65ae56d..deec3b2 100644
--- a/contrib/groffer/Makefile.sub
+++ b/contrib/groffer/Makefile.sub
@@ -42,15 +42,15 @@ MAN1=groffer.n \
 
 MOSTLYCLEANADD=groffer HAVE_PERL $(MAN1) $(ROFF2MAN) $(ROFF2PROGS)
 
-# not all make programs have $(RM) predefined.
-RM=rm -f
-
 all: groffer
 
 GROFFER_PERL=$(srcdir)/func.pl \
              $(srcdir)/man.pl \
              $(srcdir)/perl_test.pl \
              $(srcdir)/split_env.sh
+
+GROFFER_PERL_=`echo $(GROFFER_PERL) | sed 's|$(srcdir)/||g'`
+
 GROFFER_REST=$(srcdir)/roff2.man \
              $(srcdir)/version.sh \
              $(srcdir)/groffer.man \
@@ -76,8 +76,8 @@ groffer: $(GROFFER_PERL) \
 	fi
 	chmod +x $@
 	for m in $(ROFF2MODES); do \
-	  cat $(srcdir)/roff2.man \
-	  | sed 's/@ROFF2MODE@/'"$$m"'/g' > roff2$${m}.man; \
+		cat $(srcdir)/roff2.man |\
+		sed 's/@ROFF2MODE@/'"$$m"'/g' > roff2$${m}.man;\
 	done
 
 install_data: groffer
@@ -85,31 +85,30 @@ install_data: groffer
 	$(RM) $(DESTDIR)$(bindir)/groffer
 	$(INSTALL_SCRIPT) groffer $(DESTDIR)$(bindir)/groffer
 	for f in $(ROFF2PROGS); do \
-	  $(RM) $(DESTDIR)$(bindir)/$$f; \
-	  $(INSTALL_SCRIPT) $$f $(DESTDIR)$(bindir)/$$f; \
+		$(RM) $(DESTDIR)$(bindir)/$$f;\
+		$(INSTALL_SCRIPT) $$f $(DESTDIR)$(bindir)/$$f;\
 	done
-	-test -d $(DESTDIR)$(groffer_dir) \
-          || $(mkinstalldirs) $(DESTDIR)$(groffer_dir)
+	-test -d $(DESTDIR)$(groffer_dir) ||\
+		$(mkinstalldirs) $(DESTDIR)$(groffer_dir)
 	$(RM) $(DESTDIR)$(groffer_dir)/version.sh
-	$(INSTALL_DATA) $(srcdir)/version.sh \
-          $(DESTDIR)$(groffer_dir)/version.sh
+	$(INSTALL_DATA) $(srcdir)/version.sh $(DESTDIR)$(groffer_dir)/version.sh
 	for f in $(GROFFER_PERL); do \
-          $(RM) $(DESTDIR)$(groffer_dir)/$$f; \
-        done
+		$(RM) $(DESTDIR)$(groffer_dir)/$$f;\
+	done
 	if test -f HAVE_PERL; then \
-          for f in $(GROFFER_PERL); do \
-            $(INSTALL_SCRIPT) $(srcdir)/$$f \
-              $(DESTDIR)$(groffer_dir)/$$f; \
-          done; \
-        fi;
+		for f in $(GROFFER_PERL); do \
+			$(INSTALL_SCRIPT) $(srcdir)/$$f \
+				$(DESTDIR)$(groffer_dir)/$$f;\
+		done;\
+	fi
 
 uninstall_sub:
-	$(RM) $(DESTDIR)$(bindir)/groffer
-	for f in $(ROFF2PROGS); do $(RM) $(DESTDIR)$(bindir)/$$f; done
-	for f in $(GROFFER_PERL_) version.sh; do \
-          $(RM) $(DESTDIR)$(groffer_dir)/$$f; \
-        done
-	-rmdir $(DESTDIR)$(libdir)/groff/groffer
+	-$(RM) $(DESTDIR)$(bindir)/groffer
+	-for f in $(ROFF2PROGS); do $(RM) $(DESTDIR)$(bindir)/$$f; done
+	-for f in $(GROFFER_PERL_) version.sh; do \
+		$(RM) $(DESTDIR)$(groffer_dir)/$$f;\
+	done
+	-$(rmdir) $(DESTDIR)$(libdir)/groff/groffer
 
 ########################################################################
 # Emacs settings
diff --git a/contrib/hdtbl/Makefile.sub b/contrib/hdtbl/Makefile.sub
index f894a8e..193645c 100644
--- a/contrib/hdtbl/Makefile.sub
+++ b/contrib/hdtbl/Makefile.sub
@@ -96,8 +96,10 @@ MOSTLYCLEANADD=\
 .in.roff:
 	sed -e "s|@fontdir@|$(fontdir)|" $< >$@
 
+all: $(make_examples) stamp-strip
 
-all: $(PROCESSEDEXAMPLEFILES) stamp-strip
+.PHONY: examples
+examples: $(PROCESSEDEXAMPLEFILES)
 
 $(PROCESSEDEXAMPLEFILES): gnu.eps examples/stamp examples/common.roff
 
@@ -112,43 +114,48 @@ gnu.eps:
 	fi
 
 examples/stamp:
-	test -d examples || $(mkinstalldirs) examples
+	-test -d examples || $(mkinstalldirs) examples
 	touch $@
 
 stamp-strip: $(STRIPFILES)
 	for f in $(STRIPFILES); do \
-	  rm -f $$f-s; \
+	  $(RM) $$f-s; \
 	  sed -f $(top_srcdir)/tmac/strip.sed $(srcdir)/$$f >$$f-s; \
 	done
 	touch $@
 
-install_data: $(STRIPFILES) $(EXAMPLEFILES) $(GENFILES) \
-              $(PROCESSEDEXAMPLEFILES) gnu.eps stamp-strip
+install_data: install_always $(make_install_examples)
+install_always: $(STRIPFILES) $(GENFILES)
 	-test -d $(DESTDIR)$(tmacdir) || $(mkinstalldirs) $(DESTDIR)$(tmacdir)
 	for f in $(STRIPFILES); do \
-	  rm -f $(DESTDIR)$(tmacdir)/$$f; \
-	  $(INSTALL_DATA) $$f-s $(DESTDIR)$(tmacdir)/$$f; \
+		$(RM) $(DESTDIR)$(tmacdir)/$$f;\
+		$(INSTALL_DATA) $$f-s $(DESTDIR)$(tmacdir)/$$f;\
 	done
-	-test -d $(DESTDIR)$(exampledir)/hdtbl \
-	  || $(mkinstalldirs) $(DESTDIR)$(exampledir)/hdtbl
+
+install_examples: install_always $(EXAMPLEFILES) $(PROCESSEDEXAMPLEFILES) \
+		gnu.eps stamp-strip
+	-test -d $(DESTDIR)$(exampledir)/hdtbl ||\
+		$(mkinstalldirs) $(DESTDIR)$(exampledir)/hdtbl
 	for f in $(EXAMPLEFILES_); do \
-	  rm -f $(DESTDIR)$(exampledir)/hdtbl/$$f; \
-	  $(INSTALL_DATA) $(srcdir)/examples/$$f \
-	    $(DESTDIR)$(exampledir)/hdtbl/$$f; \
+		$(RM) $(DESTDIR)$(exampledir)/hdtbl/$$f;\
+		$(INSTALL_DATA) $(srcdir)/examples/$$f \
+			$(DESTDIR)$(exampledir)/hdtbl/$$f;\
 	done
 	for f in $(PROCESSEDEXAMPLEFILES_) $(GENFILES_); do \
-	  rm -f $(DESTDIR)$(exampledir)/hdtbl/$$f; \
-	  $(INSTALL_DATA) examples/$$f $(DESTDIR)$(exampledir)/hdtbl/$$f; \
+		$(RM) $(DESTDIR)$(exampledir)/hdtbl/$$f;\
+		$(INSTALL_DATA) examples/$$f $(DESTDIR)$(exampledir)/hdtbl/$$f;\
 	done
 	$(INSTALL_DATA) gnu.eps $(DESTDIR)$(exampledir)/hdtbl/gnu.eps
 
-uninstall_sub:
+uninstall_sub: uninstall_always $(make_uninstall_examples)
+uninstall_always:
 	-for f in $(STRIPFILES); do \
-	  rm -f $(DESTDIR)$(tmacdir)/$$f; \
+		$(RM) $(DESTDIR)$(tmacdir)/$$f;\
 	done
-	-for f in $(EXAMPLEFILES_) $(PROCESSEDEXAMPLEFILES_) \
-                  $(GENFILES_); do \
-	  rm -f $(DESTDIR)$(exampledir)/hdtbl/$$f; \
+
+uninstall_examples: uninstall_always
+	-for f in $(EXAMPLEFILES_) $(PROCESSEDEXAMPLEFILES_) $(GENFILES_); do \
+		$(RM) $(DESTDIR)$(exampledir)/hdtbl/$$f;\
 	done
-	-rm $(DESTDIR)$(exampledir)/hdtbl/gnu.eps
-	-rmdir $(DESTDIR)$(exampledir)/hdtbl
+	-$(RM) $(DESTDIR)$(exampledir)/hdtbl/gnu.eps
+	-$(rmdir) $(DESTDIR)$(exampledir)/hdtbl
diff --git a/contrib/mm/Makefile.sub b/contrib/mm/Makefile.sub
index cbb9a97..da49d8e 100644
--- a/contrib/mm/Makefile.sub
+++ b/contrib/mm/Makefile.sub
@@ -37,25 +37,26 @@ all: mmroff
 install_bin: install_mmroff
 
 install_data: install_m
-	-test -d $(DESTDIR)$(tmacdir)/mm \
-	  || $(mkinstalldirs) $(DESTDIR)$(tmacdir)/mm
-	-for f in $(FILES); do \
-		rm -f $(DESTDIR)$(tmacdir)/mm/$$f; \
-		$(INSTALL_DATA) $(srcdir)/mm/$$f $(DESTDIR)$(tmacdir)/mm/$$f; \
+	-test -d $(DESTDIR)$(tmacdir)/mm ||\
+		$(mkinstalldirs) $(DESTDIR)$(tmacdir)/mm
+	for f in $(FILES); do \
+		$(RM) $(DESTDIR)$(tmacdir)/mm/$$f;\
+		$(INSTALL_DATA) $(srcdir)/mm/$$f $(DESTDIR)$(tmacdir)/mm/$$f;\
 	done
-	-for f in $(LOCALE); do \
-		test -f $(DESTDIR)$(tmacdir)/mm/$$f \
-		  || touch $(DESTDIR)$(tmacdir)/mm/$$f; \
+	for f in $(LOCALE); do \
+		test -f $(DESTDIR)$(tmacdir)/mm/$$f ||\
+			touch $(DESTDIR)$(tmacdir)/mm/$$f;\
 	done
-	$(INSTALL_DATA) $(srcdir)/refer-mm.tmac $(DESTDIR)$(tmacdir)/refer-mm.tmac
+	$(INSTALL_DATA) $(srcdir)/refer-mm.tmac \
+		$(DESTDIR)$(tmacdir)/refer-mm.tmac
 
 install_m:
-	-test -d $(DESTDIR)$(tmacdir) \
-	  || $(mkinstalldirs) $(DESTDIR)$(tmacdir)
-	-rm -f $(DESTDIR)$(tmacdir)/tmac.$(tmac_m_prefix)m
-	-rm -f $(DESTDIR)$(tmacdir)/$(tmac_m_prefix)m.tmac
+	-test -d $(DESTDIR)$(tmacdir) ||\
+		$(mkinstalldirs) $(DESTDIR)$(tmacdir)
+	-$(RM) $(DESTDIR)$(tmacdir)/tmac.$(tmac_m_prefix)m
+	-$(RM) $(DESTDIR)$(tmacdir)/$(tmac_m_prefix)m.tmac
 	$(INSTALL_DATA) $(srcdir)/m.tmac \
-	  $(DESTDIR)$(tmacdir)/$(tmac_m_prefix)m.tmac
+		$(DESTDIR)$(tmacdir)/$(tmac_m_prefix)m.tmac
 	@sed -e "s;^.mso m.tmac;.mso $(tmac_m_prefix)m.tmac;g" \
 	  $(srcdir)/mse.tmac > $(DESTDIR)$(tmacdir)/$(tmac_m_prefix)mse.tmac
 	@sed -e "s;^.mso mse.tmac;.mso $(tmac_m_prefix)mse.tmac;g" \
@@ -65,27 +66,27 @@ install_m:
 
 install_mmroff: mmroff
 	-test -d $(DESTDIR)$(bindir) || $(mkinstalldirs) $(DESTDIR)$(bindir)
-	-rm -f $(DESTDIR)$(bindir)/mmroff
+	-$(RM) $(DESTDIR)$(bindir)/mmroff
 	$(INSTALL_SCRIPT) mmroff $(DESTDIR)$(bindir)/mmroff
 
 mmroff: mmroff.pl
-	-rm -f $@
+	-$(RM) $@
 	-sed -e 's;/usr/bin/perl;$(PERL);' $(srcdir)/mmroff.pl >$@
 	-chmod +x $@
 
 uninstall_sub:
 	-for f in $(FILES); do \
-		rm -f $(DESTDIR)$(tmacdir)/mm/$$f; \
+		$(RM) $(DESTDIR)$(tmacdir)/mm/$$f;\
 	done
 	-for f in $(LOCALE); do \
-		test -s $(DESTDIR)$(tmacdir)/mm/$$f \
-		  || rm -f $(DESTDIR)$(tmacdir)/mm/$$f; \
+		test -s $(DESTDIR)$(tmacdir)/mm/$$f ||\
+			$(RM) $(DESTDIR)$(tmacdir)/mm/$$f;\
 	done
-	-rm -f $(DESTDIR)$(tmacdir)/tmac.$(tmac_m_prefix)m
-	-rm -f $(DESTDIR)$(tmacdir)/$(tmac_m_prefix)m.tmac
-	-rm -f $(DESTDIR)$(tmacdir)/$(tmac_m_prefix)mm.tmac
-	-rm -f $(DESTDIR)$(tmacdir)/$(tmac_m_prefix)mse.tmac
-	-rm -f $(DESTDIR)$(tmacdir)/$(tmac_m_prefix)mmse.tmac
-	-rm -f $(DESTDIR)$(tmacdir)/refer-mm.tmac
-	-rmdir $(DESTDIR)$(tmacdir)/mm
-	-rm -f $(DESTDIR)$(bindir)/mmroff
+	-$(RM) $(DESTDIR)$(tmacdir)/tmac.$(tmac_m_prefix)m
+	-$(RM) $(DESTDIR)$(tmacdir)/$(tmac_m_prefix)m.tmac
+	-$(RM) $(DESTDIR)$(tmacdir)/$(tmac_m_prefix)mm.tmac
+	-$(RM) $(DESTDIR)$(tmacdir)/$(tmac_m_prefix)mse.tmac
+	-$(RM) $(DESTDIR)$(tmacdir)/$(tmac_m_prefix)mmse.tmac
+	-$(RM) $(DESTDIR)$(tmacdir)/refer-mm.tmac
+	-$(rmdir) $(DESTDIR)$(tmacdir)/mm
+	-$(RM) $(DESTDIR)$(bindir)/mmroff
diff --git a/contrib/mom/Makefile.sub b/contrib/mom/Makefile.sub
index e956346..2cf246e 100644
--- a/contrib/mom/Makefile.sub
+++ b/contrib/mom/Makefile.sub
@@ -116,74 +116,105 @@ MOSTLYCLEANADD=\
 .mom.pdf:
 	$(PDFMOM) $< >$@
 
-all: stamp-strip $(PROCESSEDEXAMPLEFILES)
+all: stamp-strip $(make_pdfexamples)
 
 $(PROCESSEDEXAMPLEFILES): penguin.ps penguin.pdf examples/stamp
 
+pdfexamples: $(PROCESSEDEXAMPLEFILES)
+
 penguin.ps:
 	cp $(srcdir)/examples/penguin.ps .
 penguin.pdf:
 	cp $(srcdir)/examples/penguin.pdf .
 
 examples/stamp:
-	test -d examples || $(mkinstalldirs) examples
+	-test -d examples || $(mkinstalldirs) examples
 	touch $@
 
-install_data: stamp-strip $(NORMALFILES) $(HTMLDOCFILES) \
-              $(EXAMPLEFILES) $(PROCESSEDEXAMPLEFILES)
+install_data: install_always \
+		$(make_install_pdfdoc) $(make_install_htmldoc) \
+		$(make_install_examples)
+install_always: stamp-strip $(NORMALFILES)
 	-test -d $(DESTDIR)$(tmacdir) || $(mkinstalldirs) $(DESTDIR)$(tmacdir)
 	for f in $(NORMALFILES); do \
-	  rm -f $(DESTDIR)$(tmacdir)/$$f; \
-	  $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(tmacdir)/$$f; \
+		$(RM) $(DESTDIR)$(tmacdir)/$$f;\
+		$(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(tmacdir)/$$f;\
 	done
 	for f in $(STRIPFILES); do \
-	  rm -f $(DESTDIR)$(tmacdir)/$$f; \
-	  $(INSTALL_DATA) $$f-s $(DESTDIR)$(tmacdir)/$$f; \
+		$(RM) $(DESTDIR)$(tmacdir)/$$f;\
+		$(INSTALL_DATA) $$f-s $(DESTDIR)$(tmacdir)/$$f;\
 	done
-	-test -d $(DESTDIR)$(htmldocdir)/mom \
-	  || $(mkinstalldirs) $(DESTDIR)$(htmldocdir)/mom
+
+install_pdfdoc:
+# Since this uses examples/, it's in install_pdfexamples
+
+install_htmldoc: install_always $(HTMLDOCFILES)
+	-test -d $(DESTDIR)$(htmldocdir)/mom ||\
+		$(mkinstalldirs) $(DESTDIR)$(htmldocdir)/mom
 	for f in $(HTMLDOCFILES_); do \
-	  rm -f $(DESTDIR)$(htmldocdir)/mom/$$f; \
-	  $(INSTALL_DATA) $(srcdir)/momdoc/$$f \
-	    $(DESTDIR)$(htmldocdir)/mom/$$f; \
+		$(RM) $(DESTDIR)$(htmldocdir)/mom/$$f;\
+		$(INSTALL_DATA) $(srcdir)/momdoc/$$f \
+			$(DESTDIR)$(htmldocdir)/mom/$$f;\
 	done
-	-test -d $(DESTDIR)$(exampledir)/mom \
-	  || $(mkinstalldirs) $(DESTDIR)$(exampledir)/mom
+
+install_examples: install_examples_always $(make_install_pdfexamples)
+install_examples_always: $(EXAMPLEFILES)
+	-test -d $(DESTDIR)$(exampledir)/mom ||\
+		$(mkinstalldirs) $(DESTDIR)$(exampledir)/mom
 	for f in $(EXAMPLEFILES_); do \
-	  rm -f $(DESTDIR)$(exampledir)/mom/$$f; \
-	  $(INSTALL_DATA) $(srcdir)/examples/$$f \
-	    $(DESTDIR)$(exampledir)/mom/$$f; \
+		$(RM) $(DESTDIR)$(exampledir)/mom/$$f;\
+		$(INSTALL_DATA) $(srcdir)/examples/$$f \
+			$(DESTDIR)$(exampledir)/mom/$$f;\
 	done
+
+install_pdfexamples: install_examples_always $(PROCESSEDEXAMPLEFILES)
 	for f in $(PROCESSEDEXAMPLEFILES_); do \
-	  rm -f $(DESTDIR)$(exampledir)/mom/$$f; \
-	  $(INSTALL_DATA) examples/$$f $(DESTDIR)$(exampledir)/mom/$$f; \
+		$(RM) $(DESTDIR)$(exampledir)/mom/$$f;\
+		$(INSTALL_DATA) examples/$$f $(DESTDIR)$(exampledir)/mom/$$f;\
 	done
-	-test -d $(DESTDIR)$(pdfdocdir) \
-	  || $(mkinstalldirs) $(DESTDIR)$(pdfdocdir)
+	test -d $(DESTDIR)$(pdfdocdir) ||\
+		$(mkinstalldirs) $(DESTDIR)$(pdfdocdir)
 	for f in $(PDFDOCFILE); do \
-	  rm -f $(DESTDIR)$(pdfdocdir)/$$f; \
-	  ln -s $(exampledir)/mom/$$f $(DESTDIR)$(pdfdocdir)/$$f; \
+		$(RM) $(DESTDIR)$(pdfdocdir)/$$f;\
+		ln -s $(exampledir)/mom/$$f $(DESTDIR)$(pdfdocdir)/$$f;\
 	done
 
 stamp-strip: $(STRIPFILES)
 	for f in $(STRIPFILES); do \
-	  rm -f $$f-s; \
-	  sed -f $(top_srcdir)/tmac/strip.sed $(srcdir)/$$f >$$f-s; \
+		$(RM) $$f-s;\
+		sed -f $(top_srcdir)/tmac/strip.sed $(srcdir)/$$f >$$f-s;\
 	done
 	touch $@
 
-uninstall_sub:
+uninstall_sub: uninstall_always \
+		$(make_uninstall_pdfdoc) $(make_uninstall_htmldoc) \
+		$(make_uninstall_examples)
+uninstall_always:
 	-for f in $(NORMALFILES) $(STRIPFILES); do \
-	  rm -f $(DESTDIR)$(tmacdir)/$$f; \
+		$(RM) $(DESTDIR)$(tmacdir)/$$f;\
 	done
+
+uninstall_pdfdoc: uninstall_always
+# Since that used examples/, it's in uninstall_pdfexamples
+
+uninstall_htmldoc: uninstall_always
 	-for f in $(HTMLDOCFILES_); do \
-	  rm -f $(DESTDIR)$(htmldocdir)/mom/$$f; \
+		$(RM) $(DESTDIR)$(htmldocdir)/mom/$$f;\
 	done
-	-rmdir $(DESTDIR)$(htmldocdir)/mom
-	-for f in $(EXAMPLEFILES_) $(PROCESSEDEXAMPLEFILES_); do \
-	  rm -f $(DESTDIR)$(exampledir)/mom/$$f; \
+	-$(rmdir) $(DESTDIR)$(htmldocdir)/mom
+
+uninstall_examples: uninstall_examples_always $(make_uninstall_pdfexamples)
+	-$(rmdir) $(DESTDIR)$(exampledir)/mom
+
+uninstall_examples_always:
+	-for f in $(EXAMPLEFILES_); do \
+		$(RM) $(DESTDIR)$(exampledir)/mom/$$f;\
 	done
+
+uninstall_pdfexamples: uninstall_examples_always
 	-for f in $(PDFDOCFILE); do \
-	  rm -f $(DESTDIR)$(pdfdocdir)/$$f; \
+		$(RM) $(DESTDIR)$(pdfdocdir)/$$f;\
+	done
+	-for f in $(PROCESSEDEXAMPLEFILES_); do \
+		$(RM) $(DESTDIR)$(exampledir)/mom/$$f;\
 	done
-	-rmdir $(DESTDIR)$(exampledir)/mom
diff --git a/contrib/pdfmark/Makefile.sub b/contrib/pdfmark/Makefile.sub
index 768f24a..6771ccd 100644
--- a/contrib/pdfmark/Makefile.sub
+++ b/contrib/pdfmark/Makefile.sub
@@ -38,9 +38,6 @@ MOSTLYCLEANADD=\
   $(CMDFILES) \
   pdf[0-9]*
 
-# Some `makes' don't predefine RM...
-RM=rm -f
-
 GROFF_BIN_DIR=$(top_builddir)/src/roff/groff
 GROFF_OTHER_BIN_DIRS=\
   $(top_builddir)/src/roff/troff \
@@ -90,33 +87,37 @@ pdfroff: pdfroff.sh $(SH_DEPS_SED_SCRIPT)
 	    -e "s|@GROFF_BIN_DIR@|$(bindir)|" $(srcdir)/pdfroff.sh >$@
 	chmod +x $@
 
-install_data: $(make_install_pdfdoc)
+install_data: install_always $(make_install_pdfdoc)
+install_always:
 	-test -d $(DESTDIR)$(bindir) || $(mkinstalldirs) $(DESTDIR)$(bindir)
 	for f in $(CMDFILES); do \
-	  $(RM) $(DESTDIR)$(bindir)/$$f; \
-	  $(INSTALL_SCRIPT) $$f $(DESTDIR)$(bindir)/$$f; \
+		$(RM) $(DESTDIR)$(bindir)/$$f;\
+		$(INSTALL_SCRIPT) $$f $(DESTDIR)$(bindir)/$$f;\
 	done
 	-test -d $(DESTDIR)$(tmacdir) || $(mkinstalldirs) $(DESTDIR)$(tmacdir)
 	for f in $(TMACFILES); do \
-	  $(RM) $(DESTDIR)$(tmacdir)/$$f; \
-	  $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(tmacdir)/$$f; \
+		$(RM) $(DESTDIR)$(tmacdir)/$$f;\
+		$(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(tmacdir)/$$f;\
 	done
 
-install_pdfdoc:
-	-test -d $(DESTDIR)$(pdfdocdir) \
-	  || $(mkinstalldirs) $(DESTDIR)$(pdfdocdir)
+install_pdfdoc: install_always
+	-test -d $(DESTDIR)$(pdfdocdir) ||\
+		$(mkinstalldirs) $(DESTDIR)$(pdfdocdir)
 	for f in $(PDFDOCFILES); do \
-	  $(RM) $(DESTDIR)$(pdfdocdir)/$$f; \
-	  $(INSTALL_DATA) $$f $(DESTDIR)$(pdfdocdir)/$$f; \
+		$(RM) $(DESTDIR)$(pdfdocdir)/$$f;\
+		$(INSTALL_DATA) $$f $(DESTDIR)$(pdfdocdir)/$$f;\
 	done
 
-uninstall_sub:
-	for f in $(CMDFILES); do \
-	  $(RM) $(DESTDIR)$(bindir)/$$f; \
+uninstall_sub: uninstall_always $(make_uninstall_pdfdoc)
+uninstall_always:
+	-for f in $(CMDFILES); do \
+		$(RM) $(DESTDIR)$(bindir)/$$f;\
 	done
-	for f in $(TMACFILES); do \
-	  $(RM) $(DESTDIR)$(tmacdir)/$$f; \
+	-for f in $(TMACFILES); do \
+		$(RM) $(DESTDIR)$(tmacdir)/$$f;\
 	done
-	for f in $(PDFDOCFILES); do \
-	  $(RM) $(DESTDIR)$(pdfdocdir)/$$f; \
+
+uninstall_pdfdoc: uninstall_always
+	-for f in $(PDFDOCFILES); do \
+		$(RM) $(DESTDIR)$(pdfdocdir)/$$f;\
 	done
diff --git a/contrib/pic2graph/Makefile.sub b/contrib/pic2graph/Makefile.sub
index 6deea79..619ff4e 100644
--- a/contrib/pic2graph/Makefile.sub
+++ b/contrib/pic2graph/Makefile.sub
@@ -24,7 +24,7 @@ MOSTLYCLEANADD=pic2graph
 all: pic2graph
 
 pic2graph: pic2graph.sh
-	rm -f $@; \
+	$(RM) $@; \
 	sed -e "s|@g@|$(g)|g" \
 	    -e "s|@VERSION@|$(version)$(revision)|" \
 	    -e $(SH_SCRIPT_SED_CMD) $(srcdir)/pic2graph.sh >$@; \
@@ -32,8 +32,8 @@ pic2graph: pic2graph.sh
 
 install_data: pic2graph
 	-test -d $(DESTDIR)$(bindir) || $(mkinstalldirs) $(DESTDIR)$(bindir)
-	-rm -f $(DESTDIR)$(bindir)/pic2graph
+	-$(RM) $(DESTDIR)$(bindir)/pic2graph
 	$(INSTALL_SCRIPT) pic2graph $(DESTDIR)$(bindir)/pic2graph
 
 uninstall_sub:
-	-rm -f $(DESTDIR)$(bindir)/pic2graph
+	-$(RM) $(DESTDIR)$(bindir)/pic2graph
diff --git a/doc/Makefile.sub b/doc/Makefile.sub
index 913b262..f3a0c05 100644
--- a/doc/Makefile.sub
+++ b/doc/Makefile.sub
@@ -122,12 +122,16 @@ MOSTLYCLEANNOTSRCDIRADD=\
 	$(GROFF) -Tps -ms -mwww >$@
 
 
-all: groff.info $(PROCESSEDDOCFILES) prepare_examples \
-     $(PROCESSEDEXAMPLEFILES) $(make_html)
+all: $(make_otherdoc) $(make_infodoc) $(make_htmldoc) \
+     $(make_examples) $(make_htmlexamples)
 
-html: $(HTMLDOCFILES) $(HTMLEXAMPLEFILES)
+otherdoc: $(PROCESSEDDOCFILES)
+infodoc: groff.info
+htmldoc: $(HTMLDOCFILES)
 
-prepare_examples: examples.stamp
+examples: examples.stamp $(PROCESSEDEXAMPLEFILES)
+
+html_examples: $(HTMLEXAMPLEFILES)
 
 examples.stamp: grnexmpl.g groff.css gnu.eps
 	test -f grnexmpl.g || cp $(srcdir)/grnexmpl.g .
@@ -164,87 +168,114 @@ grnexmpl.ps: grnexmpl.me grnexmpl.g
 
 distfiles: groff.info gnu.eps
 
-install_data: groff.info gnu.eps $(DOCFILES) $(PROCESSEDDOCFILES) \
-              $(make_install_html) $(EXAMPLEFILES) $(PROCESSEDEXAMPLEFILES)
-# Prefer info files in builddir over srcdir; we test for
-# the existence of `groff.info'.
-	-test -d $(DESTDIR)$(infodir) || $(mkinstalldirs) $(DESTDIR)$(infodir)
-	d=.; \
-	  test -f "groff.info" || d=$(srcdir); \
-	  for p in $$d/groff.info `ls $$d/groff.info*`; do \
-	    f=`basename $$p`; \
-	    rm -f $(DESTDIR)$(infodir)/$$f; \
-	    $(INSTALL_DATA) $$p $(DESTDIR)$(infodir)/$$f; \
-	  done
-	$(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) \
-	  $(DESTDIR)$(infodir)/groff.info
+install_data: install_always $(make_install_otherdoc) \
+		$(make_install_infodoc) $(make_install_htmldoc) \
+		$(make_install_examples)
+
+install_always:
 	-test -d $(DESTDIR)$(docdir) || $(mkinstalldirs) $(DESTDIR)$(docdir)
+
+install_otherdoc: install_always $(DOCFILES) $(PROCESSEDDOCFILES)
 	for f in $(DOCFILES); do \
-	  rm -f $(DESTDIR)$(docdir)/$$f; \
-	  $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(docdir)/$$f; \
+		$(RM) $(DESTDIR)$(docdir)/$$f;\
+		$(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(docdir)/$$f;\
 	done
 	for f in $(PROCESSEDDOCFILES); do \
-	  rm -f $(DESTDIR)$(docdir)/$$f; \
-	  $(INSTALL_DATA) $$f $(DESTDIR)$(docdir)/$$f; \
+		$(RM) $(DESTDIR)$(docdir)/$$f;\
+		$(INSTALL_DATA) $$f $(DESTDIR)$(docdir)/$$f;\
+	done
+
+install_infodoc: install_always groff.info
+# Prefer info files in builddir over srcdir; we test for
+# the existence of `groff.info'.
+	-test -d $(DESTDIR)$(infodir) || $(mkinstalldirs) $(DESTDIR)$(infodir)
+	d=.;\
+		test -f "groff.info" || d=$(srcdir);\
+		for p in $$d/groff.info `ls $$d/groff.info*`; do \
+			f=`basename $$p`;\
+			$(RM) $(DESTDIR)$(infodir)/$$f;\
+			$(INSTALL_DATA) $$p $(DESTDIR)$(infodir)/$$f;\
+		done
+	$(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) \
+		$(DESTDIR)$(infodir)/groff.info
+
+install_htmldoc: install_always $(HTMLDOCFILES)
+	-test -d $(DESTDIR)$(htmldocdir) ||\
+		$(mkinstalldirs) $(DESTDIR)$(htmldocdir)
+	for f in `ls $(HTMLDOCFILESALL)`; do \
+		$(RM) $(DESTDIR)$(htmldocdir)/$$f;\
+		$(INSTALL_DATA) $$f $(DESTDIR)$(htmldocdir)/$$f;\
 	done
+	-test -d $(DESTDIR)$(htmldocimagedir) ||\
+		$(mkinstalldirs) $(DESTDIR)$(htmldocimagedir)
+	$(RM) $(DESTDIR)$(htmldocimagedir)/$(HTMLDOCIMAGEFILES)
+	$(INSTALL_DATA) $(imagedir)/$(HTMLDOCIMAGEFILES) \
+		$(DESTDIR)$(htmldocimagedir)
+
+install_examples: install_always install_examples_always \
+		$(make_install_htmlexamples)
+install_examples_always: gnu.eps $(EXAMPLEFILES) $(PROCESSEDEXAMPLEFILES)
 # Prefer gnu.eps in builddir over srcdir.
-	-test -d $(DESTDIR)$(exampledir) \
-	  || $(mkinstalldirs) $(DESTDIR)$(exampledir)
-	d=.; \
-	  test -f "gnu.eps" || d=$(srcdir); \
-	  rm -f $(DESTDIR)$(exampledir)/gnu.eps; \
-	  $(INSTALL_DATA) $$d/gnu.eps $(DESTDIR)$(exampledir)/gnu.eps
+	-test -d $(DESTDIR)$(exampledir) ||\
+		$(mkinstalldirs) $(DESTDIR)$(exampledir)
+	d=.;\
+		test -f "gnu.eps" || d=$(srcdir);\
+		$(RM) $(DESTDIR)$(exampledir)/gnu.eps;\
+		$(INSTALL_DATA) $$d/gnu.eps $(DESTDIR)$(exampledir)/gnu.eps
 	for f in $(EXAMPLEFILES); do \
-	  rm -f $(DESTDIR)$(exampledir)/$$f; \
-	  $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(exampledir)/$$f; \
+		$(RM) $(DESTDIR)$(exampledir)/$$f;\
+		$(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(exampledir)/$$f;\
 	done
 	for f in $(PROCESSEDEXAMPLEFILES); do \
-	  rm -f $(DESTDIR)$(exampledir)/$$f; \
-	  $(INSTALL_DATA) $$f $(DESTDIR)$(exampledir)/$$f; \
+		$(RM) $(DESTDIR)$(exampledir)/$$f;\
+		$(INSTALL_DATA) $$f $(DESTDIR)$(exampledir)/$$f;\
 	done
 
-install_html: $(HTMLDOCFILES) $(HTMLEXAMPLEFILES)
-	-test -d $(DESTDIR)$(htmldocdir) \
-	  || $(mkinstalldirs) $(DESTDIR)$(htmldocdir)
-	for f in `ls $(HTMLDOCFILESALL)`; do \
-	  rm -f $(DESTDIR)$(htmldocdir)/$$f; \
-	  $(INSTALL_DATA) $$f $(DESTDIR)$(htmldocdir)/$$f; \
-	done
-	-test -d $(DESTDIR)$(htmldocimagedir) \
-	  || $(mkinstalldirs) $(DESTDIR)$(htmldocimagedir)
-	rm -f $(DESTDIR)$(htmldocimagedir)/$(HTMLDOCIMAGEFILES)
-	$(INSTALL_DATA) $(imagedir)/$(HTMLDOCIMAGEFILES) \
-	  $(DESTDIR)$(htmldocimagedir)
-	-test -d $(DESTDIR)$(exampledir) \
-	  || $(mkinstalldirs) $(DESTDIR)$(exampledir)
+install_htmlexamples: install_examples_always $(HTMLEXAMPLEFILES)
 	for f in `ls $(HTMLEXAMPLEFILESALL)`; do \
-	  rm -f $(DESTDIR)$(exampledir)/$$f; \
-	  $(INSTALL_DATA) $$f $(DESTDIR)$(exampledir)/$$f; \
+		$(RM) $(DESTDIR)$(exampledir)/$$f;\
+		$(INSTALL_DATA) $$f $(DESTDIR)$(exampledir)/$$f;\
 	done
-	-test -d $(DESTDIR)$(exampleimagedir) \
-	  || $(mkinstalldirs) $(DESTDIR)$(exampleimagedir)
-	rm -f $(DESTDIR)$(exampleimagedir)/$(HTMLEXAMPLEIMAGEFILES)
+	-test -d $(DESTDIR)$(exampleimagedir) ||\
+		$(mkinstalldirs) $(DESTDIR)$(exampleimagedir)
+	$(RM) $(DESTDIR)$(exampleimagedir)/$(HTMLEXAMPLEIMAGEFILES)
 	$(INSTALL_DATA) $(imagedir)/$(HTMLEXAMPLEIMAGEFILES) \
-	  $(DESTDIR)$(exampleimagedir)
+		$(DESTDIR)$(exampleimagedir)
 
-uninstall_sub:
-	$(INSTALL_INFO) --remove --info-dir=$(DESTDIR)$(infodir) \
-	  $(DESTDIR)$(infodir)/groff.info
-	-for f in groff `ls groff.info*`; do \
-	  rm -f $(DESTDIR)$(infodir)/$$f; \
-	done
+uninstall_sub: uninstall_always \
+		$(make_uninstall_infodoc) $(make_uninstall_htmldoc) \
+		$(make_uninstall_examples)
+uninstall_always:
 	-for f in $(DOCFILES) $(PROCESSEDDOCFILES); do \
-	  rm -f $(DESTDIR)$(docdir)/$$f; \
+		$(RM) $(DESTDIR)$(docdir)/$$f;\
+	done
+
+uninstall_infodoc: uninstall_always
+	-$(INSTALL_INFO) --remove --info-dir=$(DESTDIR)$(infodir) \
+		$(DESTDIR)$(infodir)/groff.info
+	-for f in groff `ls groff.info*`; do \
+		$(RM) $(DESTDIR)$(infodir)/$$f;\
 	done
+
+uninstall_htmldoc: uninstall_always
 	-for f in `ls $(HTMLDOCFILESALL)`; do \
-	  rm -f $(DESTDIR)$(htmldocdir)/$$f; \
+		$(RM) $(DESTDIR)$(htmldocdir)/$$f;\
+	done
+	-$(RM) $(DESTDIR)$(htmldocimagedir)/$(HTMLDOCIMAGEFILES)
+	-$(rmdir) $(DESTDIR)$(htmldocimagedir)
+
+uninstall_examples: uninstall_always uninstall_examples_always \
+		$(make_uninstall_htmlexamples)
+	-$(rmdir) $(DESTDIR)$(exampledir)
+uninstall_examples_always:
+	-for f in $(EXAMPLEFILES) $(PROCESSEDEXAMPLEFILES); do \
+		$(RM) $(DESTDIR)$(exampledir)/$$f;\
 	done
-	-rm -f $(DESTDIR)$(htmldocimagedir)/$(HTMLDOCIMAGEFILES)
-	-rmdir $(DESTDIR)$(htmldocimagedir)
-	-for f in $(EXAMPLEFILES) $(PROCESSEDEXAMPLEFILES) \
-	          `ls $(HTMLEXAMPLEFILESALL)`; do \
-	  rm -f $(DESTDIR)$(exampledir)/$$f; \
+	-$(RM) $(DESTDIR)$(exampledir)/gnu.eps
+
+uninstall_htmlexamples: uninstall_examples_always
+	-for f in `ls $(HTMLEXAMPLEFILESALL)`; do \
+		$(RM) $(DESTDIR)$(exampledir)/$$f;\
 	done
-	-rm -f $(DESTDIR)$(exampledir)/gnu.eps
-	-rm -f $(DESTDIR)$(exampleimagedir)/$(HTMLEXAMPLEIMAGEFILES)
-	-rmdir $(DESTDIR)$(exampleimagedir)
+	-$(RM) $(DESTDIR)$(exampleimagedir)/$(HTMLEXAMPLEIMAGEFILES)
+	-$(rmdir) $(DESTDIR)$(exampleimagedir)
diff --git a/font/devascii/Makefile.sub b/font/devascii/Makefile.sub
index 0fa2e77..3d732ac 100644
--- a/font/devascii/Makefile.sub
+++ b/font/devascii/Makefile.sub
@@ -9,7 +9,7 @@ LPI=6
 
 $(FONTS): R.proto
 	@echo Making $@
-	@-rm -f $@
+	@-$(RM) $@
 	@(charwidth=`expr $(RES) / $(CPI)` ; \
  	 sed -e "s/^name [A-Z]*$$/name $@/" \
 	     -e "s/^\\([^	]*\\)	[0-9][0-9]*	/\\1	$$charwidth	/" \
@@ -23,7 +23,7 @@ $(FONTS): R.proto
 
 DESC: DESC.proto
 	@echo Making $@
-	@-rm -f $@
+	@-$(RM) $@
 	@sed -e "s/^res .*$$/res $(RES)/" \
 	    -e "s/^hor .*$$/hor `expr $(RES) / $(CPI)`/" \
 	    -e "s/^vert .*$$/vert `expr $(RES) / $(LPI)`/" \
diff --git a/font/devcp1047/Makefile.sub b/font/devcp1047/Makefile.sub
index 5aa6cff..fbba2e1 100644
--- a/font/devcp1047/Makefile.sub
+++ b/font/devcp1047/Makefile.sub
@@ -9,7 +9,7 @@ LPI=6
 
 $(FONTS): R.proto
 	@echo Making $@
-	@-rm -f $@
+	@-$(RM) $@
 	@(charwidth=`expr $(RES) / $(CPI)` ; \
  	 sed -e "s/^name [A-Z]*$$/name $@/" \
 	     -e "s/^\\([^	]*\\)	[0-9][0-9]*	/\\1	$$charwidth	/" \
@@ -23,7 +23,7 @@ $(FONTS): R.proto
 
 DESC: DESC.proto
 	@echo Making $@
-	@-rm -f $@
+	@-$(RM) $@
 	@sed -e "s/^res .*$$/res $(RES)/" \
 	    -e "s/^hor .*$$/hor `expr $(RES) / $(CPI)`/" \
 	    -e "s/^vert .*$$/vert `expr $(RES) / $(LPI)`/" \
diff --git a/font/devhtml/Makefile.sub b/font/devhtml/Makefile.sub
index 36fcf77..14bb22c 100644
--- a/font/devhtml/Makefile.sub
+++ b/font/devhtml/Makefile.sub
@@ -10,7 +10,7 @@ LPI=6
 
 $(FONTS): R.proto
 	@echo Making $@
-	@-rm -f $@
+	@-$(RM) $@
 	@(charwidth=`expr $(RES) / $(CPI)` ; \
  	 sed -e "s/^name [A-Z]*$$/name $@/" \
 	     -e "s/^\\([^	]*\\)	[0-9][0-9]*	/\\1	$$charwidth	/" \
@@ -25,7 +25,7 @@ $(FONTS): R.proto
 
 DESC: DESC.proto
 	@echo Making $@
-	@-rm -f $@
+	@-$(RM) $@
 	@sed -e "s/^res .*$$/res $(RES)/" \
 	    -e "s/^hor .*$$/hor `expr $(RES) / $(CPI)`/" \
 	    -e "s/^vert .*$$/vert `expr $(RES) / $(LPI)`/" \
diff --git a/font/devlatin1/Makefile.sub b/font/devlatin1/Makefile.sub
index b261f57..ba2ad9a 100644
--- a/font/devlatin1/Makefile.sub
+++ b/font/devlatin1/Makefile.sub
@@ -9,7 +9,7 @@ LPI=6
 
 $(FONTS): R.proto
 	@echo Making $@
-	@-rm -f $@
+	@-$(RM) $@
 	@(charwidth=`expr $(RES) / $(CPI)` ; \
  	 sed -e "s/^name [A-Z]*$$/name $@/" \
 	     -e "s/^\\([^	]*\\)	[0-9][0-9]*	/\\1	$$charwidth	/" \
@@ -23,7 +23,7 @@ $(FONTS): R.proto
 
 DESC: DESC.proto
 	@echo Making $@
-	@-rm -f $@
+	@-$(RM) $@
 	@sed -e "s/^res .*$$/res $(RES)/" \
 	    -e "s/^hor .*$$/hor `expr $(RES) / $(CPI)`/" \
 	    -e "s/^vert .*$$/vert `expr $(RES) / $(LPI)`/" \
diff --git a/font/devlbp/Makefile.sub b/font/devlbp/Makefile.sub
index 7ef429d..291ce3e 100644
--- a/font/devlbp/Makefile.sub
+++ b/font/devlbp/Makefile.sub
@@ -10,7 +10,7 @@ DEVFILES=DESC \
 MOSTLYCLEANADD=DESC
 
 DESC: DESC.in
-	-rm -f DESC
+	-$(RM) DESC
 	cat $(srcdir)/DESC.in >>DESC
 	if test "$(PAGE)" = A4; then \
 	  echo "papersize a4" >>DESC; \
diff --git a/font/devlj4/Makefile.sub b/font/devlj4/Makefile.sub
index a8cd61b..44124aa 100644
--- a/font/devlj4/Makefile.sub
+++ b/font/devlj4/Makefile.sub
@@ -25,7 +25,7 @@ DEVFILES=DESC \
 MOSTLYCLEANADD=DESC
 
 DESC: DESC.in
-	-rm -f DESC
+	-$(RM) DESC
 	echo "res $(LJ4RES)" >DESC
 	echo "unitwidth `expr 7620000 / $(LJ4RES)`" >>DESC
 	cat $(srcdir)/DESC.in >>DESC
diff --git a/font/devpdf/Makefile.sub b/font/devpdf/Makefile.sub
index fa39346..3ab2dfc 100644
--- a/font/devpdf/Makefile.sub
+++ b/font/devpdf/Makefile.sub
@@ -46,22 +46,17 @@ DISTFILES=\
   $(DEVFILES) \
   $(DEVSCRIPTS)
 
-
-# Some `makes' don't predefine RM...
-RM=rm -f
-
-
 all: DESC
 
 DESC: DESC.in
-	-rm -f DESC
+	-$(RM) DESC
 	cat $(srcdir)/DESC.in >$(top_builddir)/font/devpdf/DESC
 	if test "$(PAGE)" = A4; then \
 	  echo "papersize a4" >>$(top_builddir)/font/devpdf/DESC; \
 	else \
 	  echo "papersize letter" >>$(top_builddir)/font/devpdf/DESC; \
 	fi
-	-rm -f Foundry
+	-$(RM) Foundry
 	cat $(srcdir)/Foundry.in >$(top_builddir)/font/devpdf/Foundry
 	-test -d $(top_builddir)/font/devpdf/enc \
 	  || $(mkinstalldirs) $(top_builddir)/font/devpdf/enc
@@ -121,14 +116,14 @@ install_data:
 	$(RM) $@
 
 uninstall_sub:
-	for f in $(MOSTLYCLEANADD); do \
-	  $(RM) $(DESTDIR)$(fontsubdir)/$$f; \
+	-for f in $(MOSTLYCLEANADD); do \
+		$(RM) $(DESTDIR)$(fontsubdir)/$$f;\
 	done
-	-test -d $(DESTDIR)$(fontsubdir)/enc \
-	  && rmdir $(DESTDIR)$(fontsubdir)/enc
-	-test -d $(DESTDIR)$(fontsubdir)/map \
-	  && rmdir $(DESTDIR)$(fontsubdir)/map
-	-test -d $(DESTDIR)$(fontsubdir)/util \
-	  && rmdir $(DESTDIR)$(fontsubdir)/util
-	-test -d $(DESTDIR)$(fontsubdir) \
-	  && rmdir $(DESTDIR)$(fontsubdir)
+	-d="$(DESTDIR)$(fontsubdir)/enc";\
+		if test -d "$${d}"; then $(rmdir) "$${d}"; fi
+	-d="$(DESTDIR)$(fontsubdir)/map";\
+		if test -d "$${d}"; then $(rmdir) "$${d}"; fi
+	-d="$(DESTDIR)$(fontsubdir)/util";\
+		if test -d "$${d}"; then $(rmdir) "$${d}"; fi
+	-d="$(DESTDIR)$(fontsubdir)";\
+		if test -d "$${d}"; then $(rmdir) "$${d}"; fi
diff --git a/font/devps/Makefile.sub b/font/devps/Makefile.sub
index e4aa038..2b66b9a 100644
--- a/font/devps/Makefile.sub
+++ b/font/devps/Makefile.sub
@@ -36,7 +36,7 @@ DEVSCRIPTS=$(DEVGENSCRIPTS)
 MOSTLYCLEANADD=DESC $(PSFILES)
 
 DESC: DESC.in
-	-rm -f DESC
+	-$(RM) DESC
 	cat $(srcdir)/DESC.in >DESC
 	echo broken $(BROKEN_SPOOLER_FLAGS) >>DESC
 	if test "$(PAGE)" = A4; then \
@@ -55,5 +55,5 @@ zapfdr.pfa: zapfdr.ps
 symbolsl.pfa: symbolsl.ps
 
 $(PSFILES):
-	-rm -f $@
+	-$(RM) $@
 	sed -f $(srcdir)/psstrip.sed $? >$@
diff --git a/font/devutf8/Makefile.sub b/font/devutf8/Makefile.sub
index 1047bdc..cc24924 100644
--- a/font/devutf8/Makefile.sub
+++ b/font/devutf8/Makefile.sub
@@ -9,7 +9,7 @@ LPI=6
 
 $(FONTS): R.proto
 	@echo Making $@
-	@-rm -f $@
+	@-$(RM) $@
 	@(charwidth=`expr $(RES) / $(CPI)` ; \
  	 sed -e "s/^name [A-Z]*$$/name $@/" \
 	     -e "s/^\\([^	]*\\)	[0-9][0-9]*	/\\1	$$charwidth	/" \
@@ -23,7 +23,7 @@ $(FONTS): R.proto
 
 DESC: DESC.proto
 	@echo Making $@
-	@-rm -f $@
+	@-$(RM) $@
 	@sed -e "s/^res .*$$/res $(RES)/" \
 	    -e "s/^hor .*$$/hor `expr $(RES) / $(CPI)`/" \
 	    -e "s/^vert .*$$/vert `expr $(RES) / $(LPI)`/" \
diff --git a/m4/groff.m4 b/m4/groff.m4
index 9b4ce26..77ff703 100644
--- a/m4/groff.m4
+++ b/m4/groff.m4
@@ -71,10 +71,70 @@ AC_DEFUN([GROFF_PERL],
      AC_MSG_ERROR([perl version is too old], 1))])
 
 
+# It is possible to fine-tune generation of documenation
+
+AC_DEFUN([GROFF_DOC_CHECK],
+  [AC_ARG_WITH([doc],
+    [AS_HELP_STRING([--with-doc[[=TYPE]]],
+      [choose which manuals (beside man pages) are desirable. \
+      Give TYPE as a comma-separated list of one or multiple of \
+      `html', `info', `other' and `pdf', as well as `examples', \
+      to restrict what is produced])],
+    [doc=${withval}],
+    [doc=yes])
+  test "${doc}" = "no" && doc=''
+  if test "${doc}" = yes; then
+    doc_dist_target_ok=yes
+    docadd_html=yes docadd_info=yes docadd_other=yes docadd_pdf=yes
+    docadd_examples=yes
+  else
+    # Don't use case/esac, verify input
+    doc_dist_target_ok=no
+    docadd_html= docadd_info= docadd_other= docadd_pdf=
+    docadd_examples=
+    OFS=${IFS}
+    IFS=','
+    set -- ${doc}
+    IFS=${OFS}
+    for i
+    do
+      test "${i}" = html     && { docadd_html=yes; continue; }
+      test "${i}" = info     && { docadd_info=yes; continue; }
+      test "${i}" = other    && { docadd_other=yes; continue; }
+      test "${i}" = pdf      && { docadd_pdf=yes; continue; }
+      test "${i}" = examples && { docadd_examples=yes; continue; }
+      AC_MSG_WARN([Invalid --with-doc argument:] ${i})
+    done
+  fi
+  if test "${docadd_other}" = yes; then
+    make_otherdoc=otherdoc
+    make_install_otherdoc=install_otherdoc
+    make_uninstall_otherdoc=uninstall_otherdoc
+  else
+    make_otherdoc= make_install_otherdoc= make_uninstall_otherdoc=
+  fi
+  if test "${docadd_examples}" = yes; then
+    make_examples=examples
+    make_install_examples=install_examples
+    make_uninstall_examples=uninstall_examples
+  else
+    make_examples= make_install_examples= make_uninstall_examples=
+  fi
+  AC_SUBST([doc_dist_target_ok])
+  AC_SUBST([make_otherdoc])
+  AC_SUBST([make_install_otherdoc])
+  AC_SUBST([make_uninstall_otherdoc])
+  AC_SUBST([make_examples])
+  AC_SUBST([make_install_examples])
+  AC_SUBST([make_uninstall_examples])])
+
+
 # We need makeinfo 4.8 or newer.
 
 AC_DEFUN([GROFF_MAKEINFO],
-  [missing=
+  [make_infodoc= make_install_infodoc= make_uninstall_infodoc= MAKEINFO=
+  if test "${docadd_info}" = yes; then
+   missing=
    AC_CHECK_PROG([MAKEINFO], [makeinfo], [makeinfo])
    if test -z "$MAKEINFO"; then
      missing="\`makeinfo' is missing."
@@ -107,15 +167,22 @@ AC_DEFUN([GROFF_MAKEINFO],
 `groff.texinfo' into a PDF or HTML document.])
      fi
    fi
-   AC_SUBST([MAKEINFO])])
+   make_infodoc=infodoc
+   make_install_infodoc=install_infodoc
+   make_uninstall_infodoc=uninstall_infodoc
+  fi
+  AC_SUBST([MAKEINFO])
+  AC_SUBST([make_infodoc])
+  AC_SUBST([make_install_infodoc])
+  AC_SUBST([make_uninstall_infodoc])])
 
 
 # The following programs are needed for grohtml.
 
 AC_DEFUN([GROFF_HTML_PROGRAMS],
-  [AC_REQUIRE([GROFF_GHOSTSCRIPT_PATH])
-   make_html=html
-   make_install_html=install_html
+  [make_htmldoc= make_install_htmldoc= make_uninstall_htmldoc=
+   make_htmlexamples= make_install_htmlexamples= make_uninstall_htmlexamples=
+   AC_REQUIRE([GROFF_GHOSTSCRIPT_PATH])
 
    missing=
    AC_FOREACH([groff_prog],
@@ -127,7 +194,18 @@ AC_DEFUN([GROFF_HTML_PROGRAMS],
 
    test "$GHOSTSCRIPT" = "missing" && missing="$missing \`gs'"
 
-   if test -n "$missing"; then
+   if test -z "${missing}"; then
+     if test "${docadd_html}" = yes; then
+       make_htmldoc=htmldoc
+       make_install_htmldoc=install_htmldoc
+       make_uninstall_htmldoc=uninstall_htmldoc
+       if test "${docadd_examples}" = yes; then
+         make_htmlexamples=html_examples
+         make_install_htmlexamples=install_htmlexamples
+         make_uninstall_htmlexamples=uninstall_htmlexamples
+       fi
+     fi
+   else
      plural=`set $missing; test $[#] -gt 1 && echo s`
      missing=`set $missing
        missing=""
@@ -142,56 +220,74 @@ AC_DEFUN([GROFF_HTML_PROGRAMS],
 	 done
 	 echo $missing`
 
-     make_html=
-     make_install_html=
+     docnote=.
+     test "${docadd_html}" = yes && docnote=';
+  therefore, it will neither be possible to prepare, nor to install,
+  documentation in HTML format.'
 
      AC_MSG_WARN([missing program$plural:
 
   The program$plural
      $missing
   cannot be found in the PATH.
-  Consequently, groff's HTML backend (grohtml) will not work properly;
-  therefore, it will neither be possible to prepare, nor to install,
-  documentation in HTML format.
+  Consequently, groff's HTML backend (grohtml) will not work properly${docnote}
      ])
+     doc_dist_target_ok=no
    fi
-
-   AC_SUBST([make_html])
-   AC_SUBST([make_install_html])])
+   AC_SUBST([make_htmldoc])
+   AC_SUBST([make_install_htmldoc])
+   AC_SUBST([make_uninstall_htmldoc])
+   AC_SUBST([make_htmlexamples])
+   AC_SUBST([make_install_htmlexamples])
+   AC_SUBST([make_uninstall_htmlexamples])])
 
 
 # To produce PDF docs, we need both awk and ghostscript.
 
 AC_DEFUN([GROFF_PDFDOC_PROGRAMS],
-  [AC_REQUIRE([GROFF_AWK_PATH])
+  [make_pdfdoc= make_install_pdfdoc= make_uninstall_pdfdoc=
+   make_pdfexamples= make_install_pdfexamples= make_uninstall_pdfexamples=
+   AC_REQUIRE([GROFF_AWK_PATH])
    AC_REQUIRE([GROFF_GHOSTSCRIPT_PATH])
 
-   make_pdfdoc=pdfdoc
-   make_install_pdfdoc=install_pdfdoc
-
    missing=""
    test "$AWK" = missing && missing="\`awk'"
    test "$GHOSTSCRIPT" = missing && missing="$missing \`gs'"
-   if test -n "$missing"; then
+   if test -z "${missing}"; then
+     if test "${docadd_pdf}" = yes; then
+       make_pdfdoc=pdfdoc
+       make_install_pdfdoc=install_pdfdoc
+       make_uninstall_pdfdoc=uninstall_pdfdoc
+       if test "${docadd_examples}" = yes; then
+         make_pdfexamples=pdfexamples
+         make_install_pdfexamples=install_pdfexamples
+         make_uninstall_pdfexamples=uninstall_pdfexamples
+       fi
+     fi
+   else
      plural=`set $missing; test $[#] -eq 2 && echo s`
      test x$plural = xs \
        && missing=`set $missing; echo "$[1] and $[2]"` \
        || missing=`echo $missing`
 
-     make_pdfdoc=
-     make_install_pdfdoc=
+     docnote=.
+     test "${docadd_pdf}" = yes && docnote=';
+  therefore, it will neither be possible to prepare, nor to install,
+  documentation and most of the examples in PDF format.'
 
      AC_MSG_WARN([missing program$plural:
 
   The program$plural $missing cannot be found in the PATH.
-  Consequently, groff's PDF formatter (pdfroff) will not work properly;
-  therefore, it will neither be possible to prepare, nor to install,
-  documentation in PDF format.
+  Consequently, groff's PDF formatter (pdfroff) will not work properly${docnote}
      ])
+     doc_dist_target_ok=no
    fi
-
    AC_SUBST([make_pdfdoc])
-   AC_SUBST([make_install_pdfdoc])])
+   AC_SUBST([make_install_pdfdoc])
+   AC_SUBST([make_uninstall_pdfdoc])
+   AC_SUBST([make_pdfexamples])
+   AC_SUBST([make_install_pdfexamples])
+   AC_SUBST([make_uninstall_pdfexamples])])
 
 
 # Check whether pnmtops can handle the -nosetpage option.
@@ -800,7 +896,9 @@ AC_DEFUN([GROFF_INSTALL_SH],
 # Test whether install-info is available.
 
 AC_DEFUN([GROFF_INSTALL_INFO],
-  [AC_CHECK_PROGS([INSTALL_INFO], [install-info], [:])])
+  [if test "$docadd_info" = yes; then
+    AC_CHECK_PROGS([INSTALL_INFO], [install-info], [:])
+  fi])
 
 
 # At least one UNIX system, Apple Macintosh Rhapsody 5.5,
diff --git a/src/devices/gropdf/Makefile.sub b/src/devices/gropdf/Makefile.sub
index 96aa467..b5fedd6 100644
--- a/src/devices/gropdf/Makefile.sub
+++ b/src/devices/gropdf/Makefile.sub
@@ -30,10 +30,6 @@ MOSTLYCLEANADD=\
   pdfmom \
   $(MAN1)
 
-# Some `makes' don't predefine RM...
-RM=rm -f
-
-
 all: gropdf pdfmom
 
 
@@ -61,6 +57,6 @@ install_data:
 	done
 
 uninstall_sub:
-	for f in $(CMDFILES); do \
-	  $(RM) $(DESTDIR)$(bindir)/$$f; \
+	-for f in $(CMDFILES); do \
+		$(RM) $(DESTDIR)$(bindir)/$$f;\
 	done
diff --git a/src/devices/xditview/Makefile.sub b/src/devices/xditview/Makefile.sub
index 927807e..ff2d950 100644
--- a/src/devices/xditview/Makefile.sub
+++ b/src/devices/xditview/Makefile.sub
@@ -33,7 +33,7 @@ all depend: $(GENHDRS)
 
 GXditview-ad.h: $(srcdir)/GXditview.ad
 	@echo Making $@
-	@-rm -f $@
+	@-$(RM) $@
 	$(SHELL) $(srcdir)/ad2c $(srcdir)/GXditview.ad >GXditview-ad.h
 
 install_data: $(srcdir)/GXditview.ad $(srcdir)/GXditview-color.ad
@@ -53,5 +53,5 @@ install_data: $(srcdir)/GXditview.ad $(srcdir)/GXditview-color.ad
 	  $(DESTDIR)$(appresdir)/GXditview-color
 
 uninstall_sub:
-	-rm -f $(DESTDIR)$(appresdir)/GXditview
-	-rm -f $(DESTDIR)$(appresdir)/GXditview-color
+	-$(RM) $(DESTDIR)$(appresdir)/GXditview
+	-$(RM) $(DESTDIR)$(appresdir)/GXditview-color
diff --git a/src/libs/libgroff/Makefile.sub b/src/libs/libgroff/Makefile.sub
index ac83892..ecc660a 100644
--- a/src/libs/libgroff/Makefile.sub
+++ b/src/libs/libgroff/Makefile.sub
@@ -153,38 +153,38 @@ MKINSTALLDIRS = $(SHELL) $(top_srcdir)/mkinstalldirs
 
 install_data: install_charset_data
 install_charset_data:
-	test $(GLIBC21) != no || $(MKINSTALLDIRS) $(DESTDIR)$(libdir)
+	-test $(GLIBC21) != no || $(MKINSTALLDIRS) $(DESTDIR)$(libdir)
 	if test -f $(DESTDIR)$(libdir)/charset.alias; then \
 	  sed -f ref-add.sed $(DESTDIR)$(libdir)/charset.alias \
 	      > $(DESTDIR)$(libdir)/t-charset.alias; \
 	  $(INSTALL_DATA) $(DESTDIR)$(libdir)/t-charset.alias \
 	                  $(DESTDIR)$(libdir)/charset.alias; \
-	  rm -f $(DESTDIR)$(libdir)/t-charset.alias; \
+	  $(RM) $(DESTDIR)$(libdir)/t-charset.alias; \
 	else \
 	  if test $(GLIBC21) = no; then \
 	    sed -f ref-add.sed charset.alias \
 	        > $(DESTDIR)$(libdir)/t-charset.alias; \
 	    $(INSTALL_DATA) $(DESTDIR)$(libdir)/t-charset.alias \
 	                    $(DESTDIR)$(libdir)/charset.alias; \
-	    rm -f $(DESTDIR)$(libdir)/t-charset.alias; \
+	    $(RM) $(DESTDIR)$(libdir)/t-charset.alias; \
 	  fi; \
 	fi
 
 uninstall_sub: uninstall_charset_data
 uninstall_charset_data:
-	if test -f $(DESTDIR)$(libdir)/charset.alias; then \
+	-if test -f $(DESTDIR)$(libdir)/charset.alias; then \
 	  sed -f ref-del.sed $(DESTDIR)$(libdir)/charset.alias \
 	      > $(DESTDIR)$(libdir)/t-charset.alias; \
 	  if grep '^# Packages using this file: $$' \
 	          $(DESTDIR)$(libdir)/t-charset.alias > /dev/null; then \
-	    rm -f $(DESTDIR)$(libdir)/charset.alias; \
+	    $(RM) $(DESTDIR)$(libdir)/charset.alias; \
 	  else \
 	    $(INSTALL_DATA) $(DESTDIR)$(libdir)/t-charset.alias \
 	                    $(DESTDIR)$(libdir)/charset.alias; \
 	  fi; \
-	  rm -f $(DESTDIR)$(libdir)/t-charset.alias; \
+	  $(RM) $(DESTDIR)$(libdir)/t-charset.alias; \
 	fi
 
 clean: clean_charset
 clean_charset:
-	rm -f charset.alias ref-add.sed ref-del.sed
+	$(RM) charset.alias ref-add.sed ref-del.sed
diff --git a/src/preproc/eqn/Makefile.sub b/src/preproc/eqn/Makefile.sub
index a009896..d0aed4e 100644
--- a/src/preproc/eqn/Makefile.sub
+++ b/src/preproc/eqn/Makefile.sub
@@ -46,15 +46,15 @@ MOSTLYCLEANADD=neqn
 all: neqn
 
 neqn: neqn.sh $(SH_DEPS_SED_SCRIPT)
-	-rm -f $@
+	-$(RM) $@
 	sed -e 's/@g@/$(g)/g' \
 	-f $(SH_DEPS_SED_SCRIPT) \
 	-e $(SH_SCRIPT_SED_CMD) $(srcdir)/neqn.sh >$@
 	chmod +x $@
 
 install_data: neqn
-	-rm -f $(DESTDIR)$(bindir)/$(NAMEPREFIX)neqn
+	-$(RM) $(DESTDIR)$(bindir)/$(NAMEPREFIX)neqn
 	$(INSTALL_SCRIPT) neqn $(DESTDIR)$(bindir)/$(NAMEPREFIX)neqn
 
 uninstall_sub:
-	-rm -f $(DESTDIR)$(bindir)/$(NAMEPREFIX)neqn
+	-$(RM) $(DESTDIR)$(bindir)/$(NAMEPREFIX)neqn
diff --git a/src/roff/groff/Makefile.sub b/src/roff/groff/Makefile.sub
index 6b56c3d..954cf93 100644
--- a/src/roff/groff/Makefile.sub
+++ b/src/roff/groff/Makefile.sub
@@ -39,8 +39,6 @@ GROFF_OPTS_OUTPUT=groff_opts_no_arg.txt \
 
 MOSTLYCLEANADD=groff_opts.tmp $(GROFF_OPTS_OUTPUT)
 
-RM=rm -f
-
 all: $(srcdir)/groff.cpp groff_opts.tmp $(GROFF_OPTS_OUTPUT)
 
 groff_opts.tmp: $(srcdir)/groff.cpp
@@ -70,12 +68,13 @@ install_data: $(GROFF_OPTS_OUTPUT)
 	done
 
 uninstall_sub:
-	for f in $(GROFF_OPTS_OUTPUT); do \
-		$(RM) $(DESTDIR)$(libprogramdir)/$$f; \
+	-for f in $(GROFF_OPTS_OUTPUT); do \
+		$(RM) $(DESTDIR)$(libprogramdir)/$$f;\
 	done
-	-test -d $(DESTDIR)$(libprogramdir) \
-                && -rmdir $(DESTDIR)$(libprogramdir)
-
+# XXX This will be removed by `uninstall_dirs' in `$(top_srcdir)/Makefile.in'
+# XXX (And only from there it is successful on an empty directory)
+#	-d="$(DESTDIR)$(libprogramdir)";\
+#		if test -d "$${d}"; then $(rmdir) "$${d}"; fi
 
 ########################################################################
 # Emacs settings
diff --git a/src/roff/grog/Makefile.sub b/src/roff/grog/Makefile.sub
index 080864c..6c174a9 100644
--- a/src/roff/grog/Makefile.sub
+++ b/src/roff/grog/Makefile.sub
@@ -27,9 +27,6 @@
 MAN1=grog.n
 MOSTLYCLEANADD=grog $(MAN1)
 
-# not all make programs have $(RM) predefined.
-RM=rm -f
-
 all: grog $(MAN1)
 
 # lib .pl-files
@@ -63,19 +60,18 @@ install_data: grog
 	-test -d $(DESTDIR)$(grog_dir) || \
 		$(mkinstalldirs) "$(DESTDIR)$(grog_dir)";
 	for f in $(GROG_); do \
-		-$(RM) "$(DESTDIR)$(grog_dir)/$$f"; \
+		$(RM) "$(DESTDIR)$(grog_dir)/$$f";\
 		$(INSTALL_SCRIPT) "$(srcdir)/$$f" "$(DESTDIR)$(grog_dir)/$$f"; \
 	done;
 
 .PHONY: uninstall_data
 uninstall_sub:
 	-$(RM) "$(DESTDIR)$(bindir)/grog";
-	for f in $(GROG_); do \
-		-$(RM) "$(DESTDIR)$(grog_dir)/$$f"; \
-	done;
-	-test -d "$(DESTDIR)$(grog_dir)" || \
-		-rmdir "$(DESTDIR)$(grog_dir)";
-
+	-for f in $(GROG_); do \
+		$(RM) "$(DESTDIR)$(grog_dir)/$$f";\
+	done
+	-d="$(DESTDIR)$(grog_dir)";\
+		if test -d "$${d}"; then $(rmdir) "$${d}"; fi
 
 ########################################################################
 # Emacs settings
diff --git a/src/roff/nroff/Makefile.sub b/src/roff/nroff/Makefile.sub
index a682d85..1a3526b 100644
--- a/src/roff/nroff/Makefile.sub
+++ b/src/roff/nroff/Makefile.sub
@@ -5,7 +5,7 @@ MOSTLYCLEANADD=nroff
 all: nroff
 
 nroff: nroff.sh $(SH_DEPS_SED_SCRIPT)
-	rm -f $@
+	$(RM) $@
 	sed -f $(SH_DEPS_SED_SCRIPT) \
 	-e $(SH_SCRIPT_SED_CMD) \
 	-e "s|@VERSION@|$(version)$(revision)|" $(srcdir)/nroff.sh >$@
@@ -13,8 +13,8 @@ nroff: nroff.sh $(SH_DEPS_SED_SCRIPT)
 
 install_data: nroff
 	-test -d $(DESTDIR)$(bindir) || $(mkinstalldirs) $(DESTDIR)$(bindir)
-	-rm -f $(DESTDIR)$(bindir)/$(NAMEPREFIX)nroff
+	-$(RM) $(DESTDIR)$(bindir)/$(NAMEPREFIX)nroff
 	$(INSTALL_SCRIPT) nroff $(DESTDIR)$(bindir)/$(NAMEPREFIX)nroff
 
 uninstall_sub:
-	-rm -f $(DESTDIR)$(bindir)/$(NAMEPREFIX)nroff
+	-$(RM) $(DESTDIR)$(bindir)/$(NAMEPREFIX)nroff
diff --git a/src/roff/troff/Makefile.sub b/src/roff/troff/Makefile.sub
index 782ef43..70a4c3c 100644
--- a/src/roff/troff/Makefile.sub
+++ b/src/roff/troff/Makefile.sub
@@ -40,7 +40,7 @@ NAMEPREFIX=$(g)
 
 majorminor.cpp: $(top_srcdir)/VERSION $(top_srcdir)/REVISION
 	@echo Making $@
-	@-rm -f $@
+	@-$(RM) $@
 	@echo const char \*major_version = \
 	\"`sed -e 's/^\([^.]*\)\..*$$/\1/' $(top_srcdir)/VERSION`\"\; >$@
 	@echo const char \*minor_version = \
diff --git a/src/utils/afmtodit/Makefile.sub b/src/utils/afmtodit/Makefile.sub
index 948796d..1e9df45 100644
--- a/src/utils/afmtodit/Makefile.sub
+++ b/src/utils/afmtodit/Makefile.sub
@@ -42,8 +42,8 @@ afmtodit: afmtodit.pl afmtodit.tables
 
 install_data: afmtodit
 	-test -d $(DESTDIR)$(bindir) || $(mkinstalldirs) $(DESTDIR)$(bindir)
-	-rm -f $(DESTDIR)$(bindir)/afmtodit
+	-$(RM) $(DESTDIR)$(bindir)/afmtodit
 	$(INSTALL_SCRIPT) afmtodit $(DESTDIR)$(bindir)/afmtodit
 
 uninstall_sub:
-	-rm -f $(DESTDIR)$(bindir)/afmtodit
+	-$(RM) $(DESTDIR)$(bindir)/afmtodit
diff --git a/src/utils/indxbib/Makefile.sub b/src/utils/indxbib/Makefile.sub
index 3b84008..d6433f8 100644
--- a/src/utils/indxbib/Makefile.sub
+++ b/src/utils/indxbib/Makefile.sub
@@ -19,14 +19,14 @@ install_data: $(srcdir)/eign
 	-test -d $(DESTDIR)$(datasubdir) \
 	  || $(mkinstalldirs) $(DESTDIR)$(datasubdir)
 	if test -f /usr/lib/eign; then \
-	  rm -f $(DESTDIR)$(common_words_file); \
+	  $(RM) $(DESTDIR)$(common_words_file); \
 	  ln -s /usr/lib/eign $(DESTDIR)$(common_words_file) 2>/dev/null \
 	  || ln /usr/lib/eign $(DESTDIR)$(common_words_file) 2>/dev/null \
 	  || cp /usr/lib/eign $(DESTDIR)$(common_words_file); \
 	else \
-	  rm -f $(DESTDIR)$(common_words_file); \
+	  $(RM) $(DESTDIR)$(common_words_file); \
 	  $(INSTALL_DATA) $(srcdir)/eign $(DESTDIR)$(common_words_file); \
 	fi
 
 uninstall_sub:
-	-rm -f $(DESTDIR)$(common_words_file)
+	-$(RM) $(DESTDIR)$(common_words_file)
diff --git a/src/utils/xtotroff/Makefile.in b/src/utils/xtotroff/Makefile.in
index dcfa470..47483a4 100644
--- a/src/utils/xtotroff/Makefile.in
+++ b/src/utils/xtotroff/Makefile.in
@@ -38,23 +38,23 @@ fonts: $(xtotroff) $(driverdir)/DESC.in $(driverdir)/FontMap
 	  echo Making devX$$dpi; \
 	  test -d $(devdir)/devX$$dpi || \
 	    $(mkinstalldirs) $(devdir)/devX$$dpi; \
-	  rm -f $(devdir)/devX$$dpi/DESC; \
+	  $(RM) $(devdir)/devX$$dpi/DESC; \
 	  sed -e "s/res 75/res $$dpi/" $(driverdir)/DESC.in \
 	    >$(devdir)/devX$$dpi/DESC; \
 	  (cd $(devdir)/devX$$dpi; \
-	   rm -f Makefile.sub; \
+	   $(RM) Makefile.sub; \
 	   echo DEV=X$$dpi >Makefile.sub; \
 	   echo DEVFILES=DESC $$fonts >>Makefile.sub; \
 	   $(xtotroff) -r $$dpi -s 10 $(driverdir)/FontMap); \
 	  echo Making devX$$dpi-12; \
 	  test -d $(devdir)/devX$$dpi-12 || \
 	    $(mkinstalldirs) $(devdir)/devX$$dpi-12; \
-	  rm -f $(devdir)/devX$$dpi-12/DESC; \
+	  $(RM) $(devdir)/devX$$dpi-12/DESC; \
 	  sed -e "s/res 75/res $$dpi/" \
 	      -e 's/unitwidth 10/unitwidth 12/' $(driverdir)/DESC.in \
 	    >$(devdir)/devX$$dpi-12/DESC; \
 	  (cd $(devdir)/devX$$dpi-12; \
-	   rm -f Makefile.sub; \
+	   $(RM) Makefile.sub; \
 	   echo DEV=X$$dpi-12 >Makefile.sub; \
 	   echo DEVFILES=DESC $$fonts >>Makefile.sub; \
 	   $(xtotroff) -r $$dpi -s 12 $(driverdir)/FontMap); \
diff --git a/tmac/Makefile.sub b/tmac/Makefile.sub
index 535f7ea..0e6b4e5 100644
--- a/tmac/Makefile.sub
+++ b/tmac/Makefile.sub
@@ -94,24 +94,24 @@ install_data: $(NORMALFILES) $(SPECIALFILES) man.local \
 	  done; \
 	fi
 	for f in $(NORMALFILES); do \
-	  rm -f $(DESTDIR)$(tmacdir)/$$f; \
+	  $(RM) $(DESTDIR)$(tmacdir)/$$f; \
 	  $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(tmacdir)/$$f; \
 	done
-	-rm -f $(DESTDIR)$(tmacdir)/$(tmac_s_prefix)s.tmac
+	-$(RM) $(DESTDIR)$(tmacdir)/$(tmac_s_prefix)s.tmac
 	$(INSTALL_DATA) $(srcdir)/s.tmac \
 	  $(DESTDIR)$(tmacdir)/$(tmac_s_prefix)s.tmac
-	-rm -f $(DESTDIR)$(tmacdir)/$(tmac_an_prefix)an.tmac
+	-$(RM) $(DESTDIR)$(tmacdir)/$(tmac_an_prefix)an.tmac
 	$(INSTALL_DATA) $(srcdir)/an.tmac \
 	  $(DESTDIR)$(tmacdir)/$(tmac_an_prefix)an.tmac
-	-rm -f $(DESTDIR)$(tmacdir)/www.tmac
+	-$(RM) $(DESTDIR)$(tmacdir)/www.tmac
 	$(INSTALL_DATA) www.tmac-sed $(DESTDIR)$(tmacdir)/www.tmac
 	for f in $(STRIPFILES); do \
-	  rm -f $(DESTDIR)$(tmacdir)/$$f; \
+	  $(RM) $(DESTDIR)$(tmacdir)/$$f; \
 	  $(INSTALL_DATA) $$f-s $(DESTDIR)$(tmacdir)/$$f; \
 	done
 	-test -d $(DESTDIR)$(mdocdir) || $(mkinstalldirs) $(DESTDIR)$(mdocdir)
 	for f in $(MDOCFILES); do \
-	  rm -f $(DESTDIR)$(mdocdir)/$$f; \
+	  $(RM) $(DESTDIR)$(mdocdir)/$$f; \
 	  $(INSTALL_DATA) $$f-s $(DESTDIR)$(mdocdir)/$$f; \
 	done
 	-test -f $(DESTDIR)$(localtmacdir)/man.local || \
@@ -122,7 +122,7 @@ install_data: $(NORMALFILES) $(SPECIALFILES) man.local \
 
 stamp-strip: $(STRIPFILES) $(MDOCFILES) mdoc.local
 	for f in $(STRIPFILES) $(MDOCFILES) mdoc.local; do \
-	  rm -f $$f-s; \
+	  $(RM) $$f-s; \
 	  sed -f $(srcdir)/strip.sed $(srcdir)/$$f >$$f-s; \
 	done
 	touch $@
@@ -130,7 +130,7 @@ stamp-strip: $(STRIPFILES) $(MDOCFILES) mdoc.local
 stamp-wrap:
 	if test -n "$(tmac_wrap)"; then \
 	  for m in ""$(tmac_wrap); do \
-	    rm -f $$m-wrap; \
+	    $(RM) $$m-wrap; \
 	    if test "$$m" = an; then \
 	      echo .do mso andoc.tmac >>$$m-wrap; \
 	    fi; \
@@ -141,7 +141,7 @@ stamp-wrap:
 	touch $@
 
 stamp-sed: www.tmac
-	rm -f www.tmac-sed; \
+	$(RM) www.tmac-sed; \
 	sed -e "s;@PNMTOPS_NOSETPAGE@;$(pnmtops_nosetpage);g" \
 	  $(srcdir)/www.tmac > www.tmac-sed;
 	touch $@
@@ -149,22 +149,22 @@ stamp-sed: www.tmac
 uninstall_sub:
 	-if test -n "$(tmac_wrap)"; then \
 	  for m in ""$(tmac_wrap); do \
-	    rm -f $(DESTDIR)$(systemtmacdir)/$$m.tmac; \
+	    $(RM) $(DESTDIR)$(systemtmacdir)/$$m.tmac; \
 	  done; \
 	fi
 	-for f in $(NORMALFILES) $(STRIPFILES); do \
-	  rm -f $(DESTDIR)$(tmacdir)/$$f; \
+	  $(RM) $(DESTDIR)$(tmacdir)/$$f; \
 	done
-	-rm -f $(DESTDIR)$(tmacdir)/$(tmac_s_prefix)s.tmac
-	-rm -f $(DESTDIR)$(tmacdir)/$(tmac_an_prefix)an.tmac
-	-rm -f $(DESTDIR)$(tmacdir)/www.tmac
+	-$(RM) $(DESTDIR)$(tmacdir)/$(tmac_s_prefix)s.tmac
+	-$(RM) $(DESTDIR)$(tmacdir)/$(tmac_an_prefix)an.tmac
+	-$(RM) $(DESTDIR)$(tmacdir)/www.tmac
 	-if cmp -s $(DESTDIR)$(localtmacdir)/man.local \
 	           $(srcdir)/man.local; then \
-	  rm -f $(DESTDIR)$(localtmacdir)/man.local; \
+	  $(RM) $(DESTDIR)$(localtmacdir)/man.local; \
 	fi
 	-if cmp -s $(DESTDIR)$(localtmacdir)/mdoc.local \
 	           $(srcdir)/mdoc.local; then \
-	  rm -f $(DESTDIR)$(localtmacdir)/mdoc.local; \
+	  $(RM) $(DESTDIR)$(localtmacdir)/mdoc.local; \
 	fi
-	-for f in $(MDOCFILES); do rm -f $(DESTDIR)$(mdocdir)/$$f; done
-	-rmdir $(DESTDIR)$(mdocdir)
+	-for f in $(MDOCFILES); do $(RM) $(DESTDIR)$(mdocdir)/$$f; done
+	-$(rmdir) $(DESTDIR)$(mdocdir)