[Groff-commit] groff/contrib/mm ChangeLog Makefile.sub

[Werner LEMBERG]

CVSROOT:        /cvsroot/groff
Module name:    groff
Branch:         
Changes by:     Werner LEMBERG <address@hidden> 06/02/26 14:02:30

Modified files:
        contrib/mm     : ChangeLog Makefile.sub 

Log message:
        * Makefile.sub: Add DESTDIR to install and uninstall targets
        to support staged installations.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/groff/contrib/mm/ChangeLog.diff?tr1=2.30&tr2=2.31&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/groff/groff/contrib/mm/Makefile.sub.diff?tr1=2.3&tr2=2.4&r1=text&r2=text

Patches:
Index: groff/contrib/mm/ChangeLog
diff -u groff/contrib/mm/ChangeLog:2.30 groff/contrib/mm/ChangeLog:2.31
--- groff/contrib/mm/ChangeLog:2.30     Fri Nov 25 13:33:53 2005
+++ groff/contrib/mm/ChangeLog  Sun Feb 26 14:02:30 2006
@@ -1,3 +1,8 @@
+Sun Feb 26 13:57:13 2006  Claudio Fontana  <address@hidden>
+
+       * Makefile.sub: Add DESTDIR to install and uninstall targets
+       to support staged installations.
+
 Fri Nov 25 14:31:02 2005  Werner LEMBERG  <address@hidden>
 
        * mm/ms.cov (COVEND): Protect argument for address@hidden'
Index: groff/contrib/mm/Makefile.sub
diff -u groff/contrib/mm/Makefile.sub:2.3 groff/contrib/mm/Makefile.sub:2.4
--- groff/contrib/mm/Makefile.sub:2.3   Wed May 22 06:26:12 2002
+++ groff/contrib/mm/Makefile.sub       Sun Feb 26 14:02:30 2006
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile.sub,v 2.3 2002/05/22 06:26:12 jhaegg Exp $
+# $Id: Makefile.sub,v 2.4 2006/02/26 14:02:30 wl Exp $
 #
 PROG=mmroff
 MAN1=\
@@ -17,31 +17,35 @@
 install: install_mm
 
 install_mm: install_mmroff install_m
-       -test -d $(tmacdir)/mm || $(mkinstalldirs) $(tmacdir)/mm
+       -test -d $(DESTDIR)$(tmacdir)/mm \
+         || $(mkinstalldirs) $(DESTDIR)$(tmacdir)/mm
        -for f in $(FILES); do \
-               rm -f $(tmacdir)/mm/$$f; \
-               $(INSTALL_DATA) $(srcdir)/mm/$$f $(tmacdir)/mm/$$f; \
+               rm -f $(DESTDIR)$(tmacdir)/mm/$$f; \
+               $(INSTALL_DATA) $(srcdir)/mm/$$f $(DESTDIR)$(tmacdir)/mm/$$f; \
        done
        -for f in $(LOCALE); do \
-               test -f $(tmacdir)/mm/$$f || touch $(tmacdir)/mm/$$f; \
+               test -f $(DESTDIR)$(tmacdir)/mm/$$f \
+                 || touch $(DESTDIR)$(tmacdir)/mm/$$f; \
        done
 
 install_m:
-       -test -d $(tmacdir) || $(mkinstalldirs) $(tmacdir)
-       -rm -f $(tmacdir)/tmac.$(tmac_m_prefix)m
-       -rm -f $(tmacdir)/$(tmac_m_prefix)m.tmac
-       $(INSTALL_DATA) $(srcdir)/m.tmac $(tmacdir)/$(tmac_m_prefix)m.tmac
+       -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
+       $(INSTALL_DATA) $(srcdir)/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 > $(tmacdir)/$(tmac_m_prefix)mse.tmac
+         $(srcdir)/mse.tmac > $(DESTDIR)$(tmacdir)/$(tmac_m_prefix)mse.tmac
        @sed -e "s;^.mso mse.tmac;.mso $(tmac_m_prefix)mse.tmac;g" \
-               $(srcdir)/mmse.tmac > $(tmacdir)/$(tmac_m_prefix)mmse.tmac
+         $(srcdir)/mmse.tmac > $(DESTDIR)$(tmacdir)/$(tmac_m_prefix)mmse.tmac
        @sed -e "s;^.mso m.tmac;.mso $(tmac_m_prefix)m.tmac;g" \
-               $(srcdir)/mm.tmac > $(tmacdir)/$(tmac_m_prefix)mm.tmac
+         $(srcdir)/mm.tmac > $(DESTDIR)$(tmacdir)/$(tmac_m_prefix)mm.tmac
 
 install_mmroff: mmroff
-       -test -d $(bindir) || $(mkinstalldirs) $(bindir)
-       -rm -f $(bindir)/mmroff
-       $(INSTALL_SCRIPT) mmroff $(bindir)/mmroff
+       -test -d $(DESTDIR)$(bindir) || $(mkinstalldirs) $(DESTDIR)$(bindir)
+       -rm -f $(DESTDIR)$(bindir)/mmroff
+       $(INSTALL_SCRIPT) mmroff $(DESTDIR)$(bindir)/mmroff
 
 mmroff: mmroff.pl
        -rm -f $@
@@ -49,14 +53,15 @@
        -chmod +x $@
 
 uninstall_sub:
-       -for f in $(FILES); do rm -f $(tmacdir)/mm/$$f; done
+       -for f in $(FILES); do rm -f $(DESTDIR)$(tmacdir)/mm/$$f; done
        -for f in $(LOCALE); do \
-       test -s $(tmacdir)/mm/$$f || rm -f $(tmacdir)/mm/$$f; \
+               test -s $(DESTDIR)$(tmacdir)/mm/$$f \
+                 || rm -f $(DESTDIR)$(tmacdir)/mm/$$f; \
        done
-       -rm -f $(tmacdir)/tmac.$(tmac_m_prefix)m
-       -rm -f $(tmacdir)/$(tmac_m_prefix)m.tmac
-       -rm -f $(tmacdir)/$(tmac_m_prefix)mm.tmac
-       -rm -f $(tmacdir)/$(tmac_m_prefix)mse.tmac
-       -rm -f $(tmacdir)/$(tmac_m_prefix)mmse.tmac
-       -rmdir $(tmacdir)/mm
-       -rm -f $(bindir)/mmroff
+       -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
+       -rmdir $(DESTDIR)$(tmacdir)/mm
+       -rm -f $(DESTDIR)$(bindir)/mmroff