[Groff-commit] groff ./ChangeLog ./Makefile.in doc/Makefile.su...

[Werner LEMBERG]

CVSROOT:        /cvsroot/groff
Module name:    groff
Branch:         
Changes by:     Werner LEMBERG <address@hidden> 05/08/03 07:19:00

Modified files:
        .              : ChangeLog Makefile.in 
        doc            : Makefile.sub 
        tmac           : Makefile.sub 

Log message:
        * doc/Makefile.sub (uninstall_sub): Use --remove, not --delete
        as argument to $(INSTALL_INFO).  The latter isn't portable.
        Remove $(HTMLEXAMPLEFILES) too.
        
        * Makefile.in (uninstall_dirs): Remove $(datadir)/doc/groff and
        $(datadir)/doc too.
        Suppress warning messages and return always true.
        
        * tmac/Makefile.sub (uninstall_sub): Remove www.tmac too.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/ChangeLog.diff?tr1=1.842&tr2=1.843&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/Makefile.in.diff?tr1=1.85&tr2=1.86&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/doc/Makefile.sub.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/tmac/Makefile.sub.diff?tr1=1.35&tr2=1.36&r1=text&r2=text

Patches:
Index: groff/ChangeLog
diff -u groff/ChangeLog:1.842 groff/ChangeLog:1.843
--- groff/ChangeLog:1.842       Sun Jul  3 12:18:54 2005
+++ groff/ChangeLog     Wed Aug  3 07:19:00 2005
@@ -1,3 +1,15 @@
+2005-08-02  Bernd Warken
+
+       * doc/Makefile.sub (uninstall_sub): Use --remove, not --delete
+       as argument to $(INSTALL_INFO).  The latter isn't portable.
+       Remove $(HTMLEXAMPLEFILES) too.
+
+       * Makefile.in (uninstall_dirs): Remove $(datadir)/doc/groff and
+       $(datadir)/doc too.
+       Suppress warning messages and return always true.
+
+       * tmac/Makefile.sub (uninstall_sub): Remove www.tmac too.
+
 2005-07-02  Bernd Warken
 
        * src/devices/xditview/gxditview.man: Change many `.I' to `.B'.
Index: groff/Makefile.in
diff -u groff/Makefile.in:1.85 groff/Makefile.in:1.86
--- groff/Makefile.in:1.85      Thu May 26 21:01:56 2005
+++ groff/Makefile.in   Wed Aug  3 07:19:00 2005
@@ -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
Index: groff/doc/Makefile.sub
diff -u groff/doc/Makefile.sub:1.19 groff/doc/Makefile.sub:1.20
--- groff/doc/Makefile.sub:1.19 Thu May 26 21:01:58 2005
+++ groff/doc/Makefile.sub      Wed Aug  3 07:19:00 2005
@@ -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)
Index: groff/tmac/Makefile.sub
diff -u groff/tmac/Makefile.sub:1.35 groff/tmac/Makefile.sub:1.36
--- groff/tmac/Makefile.sub:1.35        Mon Mar 14 06:25:50 2005
+++ groff/tmac/Makefile.sub     Wed Aug  3 07:19:00 2005
@@ -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