[Groff] make uninstall does not remove 2 files

[Bernd Warken]

Running `make uninstall' removes all installed `groff' positions but the
following two files and their directories
  /usr/local/share/doc/groff/1.19.2/examples/webpage.html
  /usr/local/share/groff/1.19.2/tmac/www.tmac

The following patches will fix this.

### patch in <groff-src>/tmac

--- Makefile.sub.orig   2005-03-14 07:25:50.000000000 +0100
+++ Makefile.sub        2005-08-02 16:47:50.000000000 +0200
@@ -126,6 +126,7 @@
        -rm -f $(tmacdir)/$(tmac_s_prefix)s.tmac
        -rm -f $(tmacdir)/$(tmac_an_prefix)an.tmac
        -rm -f $(tmacdir)/man.tmac $(tmacdir)/ms.tmac
+       -rm -f $(tmacdir)/www.tmac
        -if cmp -s $(localtmacdir)/man.local $(srcdir)/man.local; then \
          rm -f $(localtmacdir)/man.local; \
        fi

### patch in <groff-src>/doc

--- Makefile.sub.orig   2005-05-26 23:01:58.000000000 +0200
+++ Makefile.sub        2005-08-02 18:02:07.000000000 +0200
@@ -216,7 +216,7 @@
        -for f in groff `ls groff-*`; do \
          rm -f $(infodir)/$$f; \
        done
-       $(INSTALL_INFO) --delete --info-dir=$(infodir) $(infodir)/groff
+       $(INSTALL_INFO) --remove --info-dir=$(infodir) $(infodir)/groff
        -for f in $(DOCFILES) $(PROCESSEDDOCFILES); do \
          rm -f $(docdir)/$$f; \
        done
@@ -225,7 +225,7 @@
        done
        -rm -f $(htmldocimagedir)/$(HTMLDOCIMAGEFILES)
        -rmdir $(htmldocimagedir)
-       -for f in $(EXAMPLEFILES) $(PROCESSEDEXAMPLEFILES); do \
+       -for f in $(EXAMPLEFILES) $(PROCESSEDEXAMPLEFILES) $(HTMLEXAMPLEFILES); 
do \
          rm -f $(exampledir)/$$f; \
        done
        -rm -f $(exampleimagedir)/$(HTMLEXAMPLEIMAGEFILES)

### end of patch

This patch additionally includes a fix for install-info.  The option --remove is
equivalent to --delete, but --delete is not supported by all versions of 
install-info.


With these two patches, all files are deleted.  But there is still a directory 
that is
not removed altho it is empty now:
  /usr/local/share/doc/groff/

This directory is $(datadir)/doc/groff in Makefiles.  The following patch 
removes it.

### patch in the top directory of <groff-src>

--- Makefile.in.orig    2005-05-26 23:01:56.000000000 +0200
+++ Makefile.in 2005-08-02 18:11:29.000000000 +0200
@@ -739,9 +739,10 @@
        -rmdir $(man1dir) $(man5dir) $(man7dir) $(manroot) \
          $(tmacdir) $(systemtmacdir) $(localtmacdir) \
          $(fontdir) $(localfontdir) $(bindir) \
-         $(datasubdir) $(dataprogramdir) $(datadir) $(infodir) \
+         $(datasubdir) $(dataprogramdir) $(infodir) \
          $(exampledir) $(htmldocdir) $(pdfdocdir) $(docdir) \
-         $(libprogramdir) $(libdir)
+         $(libprogramdir) $(libdir) \
+         $(datadir)/doc/groff $(datadir)/doc $(datadir) 2>/dev/null || :

 .PHONY: check docheck
 check: site.exp docheck

### end of patch

This patch additionally has the following features: 

- $(datadir) is handled too early and due to the existence of $(datadir)/doc
  it is never deleted.

- The rmdir command produces a lot of nasty, unnecessary errors; these
  are avoided by adding `2>/dev/null' and `|| :'.

Bernd Warken

______________________________________________________________
Verschicken Sie romantische, coole und witzige Bilder per SMS!
Jetzt bei WEB.DE FreeMail: http://f.web.de/?mc=021193