From 91a4472253fff23acf3a902d64d43d27d7ffcb5d Mon Sep 17 00:00:00 2001
From: wl <wl>
Date: Sun, 26 Feb 2006 14:03:25 +0000
Subject: * Makefile.in: Add comment about DESTDIR.

* Makefile.sub: Add DESTDIR to install and uninstall targets
to support staged installations.
* Makefile.comm: Likewise.
* doc/Makefile.sub: Likewise.
* contrib/eqn2graph/Makefile.sub: Likewise.
* contrib/gdiffmk/Makefile.sub: Likewise.
* contrib/grap2graph/Makefile.sub: Likewise.
* contrib/pic2graph/Makefile.sub: Likewise.
* src/devices/xditview/Makefile.sub: Likewise.
* src/preproc/eqn/Makefile.sub: Likewise.
* src/roff/grog/Makefile.sub: Likewise.
* src/roff/nroff/Makefile.sub: Likewise.
* src/utils/afmtodit/Makefile.sub: Likewise.
* src/utils/indxbib/Makefile.sub: Likewise.
* tmac/Makefile.sub: Likewise.
---
 ChangeLog                         | 20 ++++++++++
 Makefile.comm                     | 76 +++++++++++++++++++-----------------
 Makefile.in                       |  3 ++
 Makefile.sub                      |  3 +-
 configure                         |  2 +-
 contrib/eqn2graph/Makefile.sub    |  8 ++--
 contrib/gdiffmk/Makefile.sub      |  8 ++--
 contrib/grap2graph/Makefile.sub   |  8 ++--
 contrib/pic2graph/Makefile.sub    |  8 ++--
 doc/Makefile.sub                  | 82 ++++++++++++++++++++++-----------------
 m4/groff.m4                       |  4 +-
 src/devices/xditview/Makefile.sub | 13 ++++---
 src/preproc/eqn/Makefile.sub      |  6 +--
 src/roff/grog/Makefile.sub        |  8 ++--
 src/roff/nroff/Makefile.sub       |  8 ++--
 src/utils/afmtodit/Makefile.sub   |  8 ++--
 src/utils/indxbib/Makefile.sub    | 23 ++++++-----
 tmac/Makefile.sub                 | 82 +++++++++++++++++++++------------------
 18 files changed, 211 insertions(+), 159 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8ca4c985..15ea197e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+2006-02-26  Claudio Fontana  <claudio@gnu.org>
+
+	* Makefile.in: Add comment about DESTDIR.
+
+	* Makefile.sub: Add DESTDIR to install and uninstall targets
+	to support staged installations.
+	* Makefile.comm: Likewise.
+	* doc/Makefile.sub: Likewise.
+	* contrib/eqn2graph/Makefile.sub: Likewise.
+	* contrib/gdiffmk/Makefile.sub: Likewise.
+	* contrib/grap2graph/Makefile.sub: Likewise.
+	* contrib/pic2graph/Makefile.sub: Likewise.
+	* src/devices/xditview/Makefile.sub: Likewise.
+	* src/preproc/eqn/Makefile.sub: Likewise.
+	* src/roff/grog/Makefile.sub: Likewise.
+	* src/roff/nroff/Makefile.sub: Likewise.
+	* src/utils/afmtodit/Makefile.sub: Likewise.
+	* src/utils/indxbib/Makefile.sub: Likewise.
+	* tmac/Makefile.sub: Likewise.
+
 2006-02-24  Werner LEMBERG  <wl@gnu.org>
 
 	* src/libs/libgroff/glyphuni.cpp (glyph_to_unicode_list): Use entry
diff --git a/Makefile.comm b/Makefile.comm
index fc34a568..39432cc4 100644
--- a/Makefile.comm
+++ b/Makefile.comm
@@ -1,4 +1,5 @@
-# Copyright (C) 1989-2000, 2002, 2003, 2004 Free Software Foundation, Inc.
+# Copyright (C) 1989-2000, 2002, 2003, 2004, 2006
+#   Free Software Foundation, Inc.
 #      Written by James Clark (jjc@jclark.com)
 # 
 # This file is part of groff.
@@ -63,11 +64,8 @@ pure:
 .PHONY: pure
 
 prefix_must_exist:
-	@test -d $(prefix) \
-	  || (echo ; \
-	      echo The prefix directory \`$(prefix)\' doesn\'t exist; \
-	      echo ; \
-	      exit 1)
+	@test -d $(DESTDIR)$(prefix) \
+	  || $(mkinstalldirs) $(DESTDIR)$(prefix)
 
 mostlyclean:
 	-rm -f $(MOSTLYCLEANFILES)
@@ -170,28 +168,28 @@ extraclean: distclean
 
 .PHONY: install_man
 install_man:
-	-test -d $(manroot) || $(mkinstalldirs) $(manroot)
-	-test -d $(man1dir) || $(mkinstalldirs) $(man1dir)
+	-test -d $(DESTDIR)$(manroot) || $(mkinstalldirs) $(DESTDIR)$(manroot)
+	-test -d $(DESTDIR)$(man1dir) || $(mkinstalldirs) $(DESTDIR)$(man1dir)
 	@-pages="$(MAN1)"; \
 	for p in $$pages; do \
 	 prog=`basename $$p .n`; \
-	 target=$(man1dir)/$(NAMEPREFIX)$$prog.$(man1ext); \
+	 target=$(DESTDIR)$(man1dir)/$(NAMEPREFIX)$$prog.$(man1ext); \
 	 rm -f $$target; \
 	 echo $(INSTALL_DATA) $$p $$target; \
 	 $(INSTALL_DATA) $$p $$target; \
 	done
-	-test -d $(man5dir) || $(mkinstalldirs) $(man5dir)
+	-test -d $(DESTDIR)$(man5dir) || $(mkinstalldirs) $(DESTDIR)$(man5dir)
 	@-pages="$(MAN5)"; \
 	for p in $$pages; do \
-	 target=$(man5dir)/`basename $$p .n`.$(man5ext); \
+	 target=$(DESTDIR)$(man5dir)/`basename $$p .n`.$(man5ext); \
 	 rm -f $$target; \
 	 echo $(INSTALL_DATA) $$p $$target; \
 	 $(INSTALL_DATA) $$p $$target; \
 	done
-	-test -d $(man7dir) || $(mkinstalldirs) $(man7dir)
+	-test -d $(DESTDIR)$(man7dir) || $(mkinstalldirs) $(DESTDIR)$(man7dir)
 	@-pages="$(MAN7)"; \
 	for p in $$pages; do \
-	 target=$(man7dir)/`basename $$p .n`.$(man7ext); \
+	 target=$(DESTDIR)$(man7dir)/`basename $$p .n`.$(man7ext); \
 	 rm -f $$target; \
 	 echo $(INSTALL_DATA) $$p $$target; \
 	 $(INSTALL_DATA) $$p $$target; \
@@ -201,60 +199,65 @@ install_man:
 uninstall_man:
 	@-pages="$(MAN1)"; \
 	for p in $$pages; do \
-	 target=$(man1dir)/$(NAMEPREFIX)`basename $$p .n`.$(man1ext); \
+	 target=$(DESTDIR)$(man1dir)/$(NAMEPREFIX)`basename $$p .n`.$(man1ext); \
 	 echo rm -f $$target; \
 	 rm -f $$target; \
 	done
 	@-pages="$(MAN5)"; \
 	for p in $$pages; do \
-	 target=$(man5dir)/`basename $$p .n`.$(man5ext); \
+	 target=$(DESTDIR)$(man5dir)/`basename $$p .n`.$(man5ext); \
 	 echo rm -f $$target; \
 	 rm -f $$target; \
 	done
 	@-pages="$(MAN7)"; \
 	for p in $$pages; do \
-	 target=$(man7dir)/`basename $$p .n`.$(man7ext); \
+	 target=$(DESTDIR)$(man7dir)/`basename $$p .n`.$(man7ext); \
 	 echo rm -f $$target; \
 	 rm -f $$target; \
 	done
 
 .PHONY: install_prog
 install_prog:
-	-test -d $(bindir) || $(mkinstalldirs) $(bindir)
-	rm -f $(bindir)/$(NAMEPREFIX)$(PROG)
-	$(INSTALL_PROGRAM) $(PROG) $(bindir)/$(NAMEPREFIX)$(PROG)
+	-test -d $(DESTDIR)$(bindir) || $(mkinstalldirs) $(DESTDIR)$(bindir)
+	rm -f $(DESTDIR)$(bindir)/$(NAMEPREFIX)$(PROG)
+	$(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(bindir)/$(NAMEPREFIX)$(PROG)
 
 .PHONY: uninstall_prog
 uninstall_prog:
-	-rm -f $(bindir)/$(NAMEPREFIX)$(PROG)	
+	-rm -f $(DESTDIR)$(bindir)/$(NAMEPREFIX)$(PROG)	
 
 .PHONY: install_dev
 install_dev:
-	-test -d $(datadir) || $(mkinstalldirs) $(datadir)
-	-test -d $(dataprogramdir) || $(mkinstalldirs) $(dataprogramdir)
-	-test -d $(datasubdir) || $(mkinstalldirs) $(datasubdir)
-	-test -d $(fontdir) || $(mkinstalldirs) $(fontdir)
-	-test -d $(fontsubdir) || $(mkinstalldirs) $(fontsubdir)
+	-test -d $(DESTDIR)$(datadir) \
+	  || $(mkinstalldirs) $(DESTDIR)$(datadir)
+	-test -d $(DESTDIR)$(dataprogramdir) \
+	  || $(mkinstalldirs) $(DESTDIR)$(dataprogramdir)
+	-test -d $(DESTDIR)$(datasubdir) \
+	  || $(mkinstalldirs) $(DESTDIR)$(datasubdir)
+	-test -d $(DESTDIR)$(fontdir) \
+	  || $(mkinstalldirs) $(DESTDIR)$(fontdir)
+	-test -d $(DESTDIR)$(fontsubdir) \
+	  || $(mkinstalldirs) $(DESTDIR)$(fontsubdir)
 	-if test -d $(srcdir)/generate; then \
-	  test -d $(fontsubdir)/generate \
-	    || $(mkinstalldirs) $(fontsubdir)/generate; \
+	  test -d $(DESTDIR)$(fontsubdir)/generate \
+	    || $(mkinstalldirs) $(DESTDIR)$(fontsubdir)/generate; \
 	fi
 	-test -z "$(DEVFILES)" \
 	  || for f in ""$(DEVFILES); do \
-	       rm -f $(fontsubdir)/$$f; \
+	       rm -f $(DESTDIR)$(fontsubdir)/$$f; \
 	       if test -f $$f; then \
-		 $(INSTALL_DATA) $$f $(fontsubdir)/$$f; \
+		 $(INSTALL_DATA) $$f $(DESTDIR)$(fontsubdir)/$$f; \
 	       else \
-		 $(INSTALL_DATA) $(srcdir)/$$f $(fontsubdir)/$$f; \
+		 $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(fontsubdir)/$$f; \
 	       fi; \
 	     done
 	-test -z "$(DEVSCRIPTS)" \
 	  || for f in ""$(DEVSCRIPTS); do \
-	       rm -f $(fontsubdir)/$$f; \
+	       rm -f $(DESTDIR)$(fontsubdir)/$$f; \
 	       if test -f $$f; then \
-		 $(INSTALL_SCRIPT) $$f $(fontsubdir)/$$f; \
+		 $(INSTALL_SCRIPT) $$f $(DESTDIR)$(fontsubdir)/$$f; \
 	       else \
-		 $(INSTALL_SCRIPT) $(srcdir)/$$f $(fontsubdir)/$$f; \
+		 $(INSTALL_SCRIPT) $(srcdir)/$$f $(DESTDIR)$(fontsubdir)/$$f; \
 	       fi; \
 	     done
 
@@ -262,10 +265,11 @@ install_dev:
 uninstall_dev:
 	-test -z "$(DEVFILES)$(DEVSCRIPTS)" \
 	  || for f in ""$(DEVFILES) $(DEVSCRIPTS); do \
-	       rm -f $(fontsubdir)/$$f; \
+	       rm -f $(DESTDIR)$(fontsubdir)/$$f; \
 	     done
-	-test -d $(fontsubdir)/generate && rmdir $(fontsubdir)/generate
-	-rmdir $(fontsubdir)
+	-test -d $(DESTDIR)$(fontsubdir)/generate \
+	  && rmdir $(DESTDIR)$(fontsubdir)/generate
+	-rmdir $(DESTDIR)$(fontsubdir)
 
 .PHONY: depend_src
 depend_src: depend.temp
diff --git a/Makefile.in b/Makefile.in
index 8169b08f..88efdab9 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -260,6 +260,9 @@ make_install_html=@make_install_html@
 make_pdfdoc=@make_pdfdoc@
 make_install_pdfdoc=@make_install_pdfdoc@
 
+# All the previous installation directories, when used, are prefixed with
+# $(DESTDIR) during install and uninstall, to support staged installations.
+
 # DEFINES should include the following:
 #
 # -DWORDS_BIGENDIAN		if your target platform is big-endian
diff --git a/Makefile.sub b/Makefile.sub
index ddb18fcf..c24f2bf7 100644
--- a/Makefile.sub
+++ b/Makefile.sub
@@ -41,4 +41,5 @@ stamp-h: config.hin config.status
 
 # Always create the site-font directory as a guide to the user.
 install_data:
-	-test -d $(localfontdir) || $(mkinstalldirs) $(localfontdir)
+	-test -d $(DESTDIR)$(localfontdir) \
+	  || $(mkinstalldirs) $(DESTDIR)$(localfontdir)
diff --git a/configure b/configure
index 400e292d..fde44575 100755
--- a/configure
+++ b/configure
@@ -1096,7 +1096,7 @@ Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
   --with-x                use the X Window System
-       --with-appresdir=DIR    X11 application resource files
+  --with-appresdir=DIR    X11 application resource files
   --with-gnu-ld           assume the C compiler uses GNU ld default=no
   --with-libiconv-prefix[=DIR]  search for libiconv in DIR/include and DIR/lib
   --without-libiconv-prefix     don't search for libiconv in includedir and libdir
diff --git a/contrib/eqn2graph/Makefile.sub b/contrib/eqn2graph/Makefile.sub
index 6ccdd982..2565f5a6 100644
--- a/contrib/eqn2graph/Makefile.sub
+++ b/contrib/eqn2graph/Makefile.sub
@@ -11,9 +11,9 @@ eqn2graph: eqn2graph.sh
 	chmod +x $@
 
 install_data: eqn2graph
-	-test -d $(bindir) || $(mkinstalldirs) $(bindir)
-	-rm -f $(bindir)/eqn2graph
-	$(INSTALL_SCRIPT) eqn2graph $(bindir)/eqn2graph
+	-test -d $(DESTDIR)$(bindir) || $(mkinstalldirs) $(DESTDIR)$(bindir)
+	-rm -f $(DESTDIR)$(bindir)/eqn2graph
+	$(INSTALL_SCRIPT) eqn2graph $(DESTDIR)$(bindir)/eqn2graph
 
 uninstall_sub:
-	-rm -f $(bindir)/eqn2graph
+	-rm -f $(DESTDIR)$(bindir)/eqn2graph
diff --git a/contrib/gdiffmk/Makefile.sub b/contrib/gdiffmk/Makefile.sub
index 5e0cd147..ae2ba945 100644
--- a/contrib/gdiffmk/Makefile.sub
+++ b/contrib/gdiffmk/Makefile.sub
@@ -39,9 +39,9 @@ gdiffmk: gdiffmk.sh
 	chmod +x $@
 
 install_data: gdiffmk
-	-test -d $(bindir)  ||  $(mkinstalldirs) $(bindir)
-	-rm -f $(bindir)/gdiffmk
-	$(INSTALL_SCRIPT) gdiffmk $(bindir)/gdiffmk
+	-test -d $(DESTDIR)$(bindir)  ||  $(mkinstalldirs) $(DESTDIR)$(bindir)
+	-rm -f $(DESTDIR)$(bindir)/gdiffmk
+	$(INSTALL_SCRIPT) gdiffmk $(DESTDIR)$(bindir)/gdiffmk
 
 uninstall_sub:
-	-rm -f $(bindir)/gdiffmk
+	-rm -f $(DESTDIR)$(bindir)/gdiffmk
diff --git a/contrib/grap2graph/Makefile.sub b/contrib/grap2graph/Makefile.sub
index 5527618e..3089a447 100644
--- a/contrib/grap2graph/Makefile.sub
+++ b/contrib/grap2graph/Makefile.sub
@@ -11,9 +11,9 @@ grap2graph: grap2graph.sh
 	chmod +x $@
 
 install_data: grap2graph
-	-test -d $(bindir) || $(mkinstalldirs) $(bindir)
-	-rm -f $(bindir)/grap2graph
-	$(INSTALL_SCRIPT) grap2graph $(bindir)/grap2graph
+	-test -d $(DESTDIR)$(bindir) || $(mkinstalldirs) $(DESTDIR)$(bindir)
+	-rm -f $(DESTDIR)$(bindir)/grap2graph
+	$(INSTALL_SCRIPT) grap2graph $(DESTDIR)$(bindir)/grap2graph
 
 uninstall_sub:
-	-rm -f $(bindir)/grap2graph
+	-rm -f $(DESTDIR)$(bindir)/grap2graph
diff --git a/contrib/pic2graph/Makefile.sub b/contrib/pic2graph/Makefile.sub
index d01a4353..51b71400 100644
--- a/contrib/pic2graph/Makefile.sub
+++ b/contrib/pic2graph/Makefile.sub
@@ -11,9 +11,9 @@ pic2graph: pic2graph.sh
 	chmod +x $@
 
 install_data: pic2graph
-	-test -d $(bindir) || $(mkinstalldirs) $(bindir)
-	-rm -f $(bindir)/pic2graph
-	$(INSTALL_SCRIPT) pic2graph $(bindir)/pic2graph
+	-test -d $(DESTDIR)$(bindir) || $(mkinstalldirs) $(DESTDIR)$(bindir)
+	-rm -f $(DESTDIR)$(bindir)/pic2graph
+	$(INSTALL_SCRIPT) pic2graph $(DESTDIR)$(bindir)/pic2graph
 
 uninstall_sub:
-	-rm -f $(bindir)/pic2graph
+	-rm -f $(DESTDIR)$(bindir)/pic2graph
diff --git a/doc/Makefile.sub b/doc/Makefile.sub
index 0856d6a6..f568aa8c 100644
--- a/doc/Makefile.sub
+++ b/doc/Makefile.sub
@@ -165,68 +165,78 @@ distfiles: groff.info gnu.eps gnu.png
 
 install_data: groff.info $(DOCFILES) $(PROCESSEDDOCFILES) $(make_install_html) \
               $(EXAMPLEFILES) $(PROCESSEDEXAMPLEFILES)
-	-test -d $(infodir) || $(mkinstalldirs) $(infodir)
+	-test -d $(DESTDIR)$(infodir) || $(mkinstalldirs) $(DESTDIR)$(infodir)
 # Prefer info files in builddir over srcdir; we test for
 # the existence of `groff.info'.
 	d=.; \
 	  test -f "groff.info" || d=$(srcdir); \
 	  for f in $$d/groff.info `ls $$d/groff.info*`; do \
-	    rm -f $(infodir)/$$f; \
-	    $(INSTALL_DATA) $$f $(infodir)/$$f; \
+	    rm -f $(DESTDIR)$(infodir)/$$f; \
+	    $(INSTALL_DATA) $$f $(DESTDIR)$(infodir)/$$f; \
 	  done
-	$(INSTALL_INFO) --info-dir=$(infodir) $(infodir)/groff.info
-	-test -d $(docdir) || $(mkinstalldirs) $(docdir)
+	$(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) \
+	  $(DESTDIR)$(infodir)/groff.info
+	-test -d $(DESTDIR)$(docdir) || $(mkinstalldirs) $(DESTDIR)$(docdir)
 	for f in $(DOCFILES); do \
-	  rm -f $(docdir)/$$f; \
-	  $(INSTALL_DATA) $(srcdir)/$$f $(docdir)/$$f; \
+	  rm -f $(DESTDIR)$(docdir)/$$f; \
+	  $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(docdir)/$$f; \
 	done
 	for f in $(PROCESSEDDOCFILES); do \
-	  rm -f $(docdir)/$$f; \
-	  $(INSTALL_DATA) $$f $(docdir)/$$f; \
+	  rm -f $(DESTDIR)$(docdir)/$$f; \
+	  $(INSTALL_DATA) $$f $(DESTDIR)$(docdir)/$$f; \
 	done
-	-test -d $(exampledir) || $(mkinstalldirs) $(exampledir)
+	-test -d $(DESTDIR)$(exampledir) \
+	  || $(mkinstalldirs) $(DESTDIR)$(exampledir)
 	for f in $(EXAMPLEFILES); do \
-	  rm -f $(exampledir)/$$f; \
-	  $(INSTALL_DATA) $(srcdir)/$$f $(exampledir)/$$f; \
+	  rm -f $(DESTDIR)$(exampledir)/$$f; \
+	  $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(exampledir)/$$f; \
 	done
 	for f in $(PROCESSEDEXAMPLEFILES); do \
-	  rm -f $(exampledir)/$$f; \
-	  $(INSTALL_DATA) $$f $(exampledir)/$$f; \
+	  rm -f $(DESTDIR)$(exampledir)/$$f; \
+	  $(INSTALL_DATA) $$f $(DESTDIR)$(exampledir)/$$f; \
 	done
 
 install_html: $(HTMLDOCFILES) $(HTMLEXAMPLEFILES)
-	-test -d $(htmldocdir) || $(mkinstalldirs) $(htmldocdir)
+	-test -d $(DESTDIR)$(htmldocdir) \
+	  || $(mkinstalldirs) $(DESTDIR)$(htmldocdir)
 	for f in `ls $(HTMLDOCFILESALL)`; do \
-	  rm -f $(htmldocdir)/$$f; \
-	  $(INSTALL_DATA) $$f $(htmldocdir)/$$f; \
+	  rm -f $(DESTDIR)$(htmldocdir)/$$f; \
+	  $(INSTALL_DATA) $$f $(DESTDIR)$(htmldocdir)/$$f; \
 	done
-	-test -d $(htmldocimagedir) || $(mkinstalldirs) $(htmldocimagedir)
-	rm -f $(htmldocimagedir)/$(HTMLDOCIMAGEFILES)
-	$(INSTALL_DATA) $(imagedir)/$(HTMLDOCIMAGEFILES) $(htmldocimagedir)
-	-test -d $(exampledir) || $(mkinstalldirs) $(exampledir)
+	-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)
 	for f in $(HTMLEXAMPLEFILES); do \
-	  rm -f $(exampledir)/$$f; \
-	  $(INSTALL_DATA) $$f $(exampledir)/$$f; \
+	  rm -f $(DESTDIR)$(exampledir)/$$f; \
+	  $(INSTALL_DATA) $$f $(DESTDIR)$(exampledir)/$$f; \
 	done
-	-test -d $(exampleimagedir) || $(mkinstalldirs) $(exampleimagedir)
-	rm -f $(exampleimagedir)/$(HTMLEXAMPLEIMAGEFILES)
-	$(INSTALL_DATA) $(imagedir)/$(HTMLEXAMPLEIMAGEFILES) $(exampleimagedir)
+	-test -d $(DESTDIR)$(exampleimagedir) \
+	  || $(mkinstalldirs) $(DESTDIR)$(exampleimagedir)
+	rm -f $(DESTDIR)$(exampleimagedir)/$(HTMLEXAMPLEIMAGEFILES)
+	$(INSTALL_DATA) $(imagedir)/$(HTMLEXAMPLEIMAGEFILES) \
+	  $(DESTDIR)$(exampleimagedir)
 
 uninstall_sub:
 	-for f in groff `ls groff-*`; do \
-	  rm -f $(infodir)/$$f; \
+	  rm -f $(DESTDIR)$(infodir)/$$f; \
 	done
-	$(INSTALL_INFO) --remove --info-dir=$(infodir) $(infodir)/groff.info
+	$(INSTALL_INFO) --remove --info-dir=$(DESTDIR)$(infodir) \
+	  $(DESTDIR)$(infodir)/groff.info
 	-for f in $(DOCFILES) $(PROCESSEDDOCFILES); do \
-	  rm -f $(docdir)/$$f; \
+	  rm -f $(DESTDIR)$(docdir)/$$f; \
 	done
 	-for f in `ls $(HTMLDOCFILESALL)`; do \
-	  rm -f $(htmldocdir)/$$f; \
+	  rm -f $(DESTDIR)$(htmldocdir)/$$f; \
 	done
-	-rm -f $(htmldocimagedir)/$(HTMLDOCIMAGEFILES)
-	-rmdir $(htmldocimagedir)
-	-for f in $(EXAMPLEFILES) $(PROCESSEDEXAMPLEFILES) $(HTMLEXAMPLEFILES); do \
-	  rm -f $(exampledir)/$$f; \
+	-rm -f $(DESTDIR)$(htmldocimagedir)/$(HTMLDOCIMAGEFILES)
+	-rmdir $(DESTDIR)$(htmldocimagedir)
+	-for f in $(EXAMPLEFILES) $(PROCESSEDEXAMPLEFILES) \
+	          $(HTMLEXAMPLEFILES); do \
+	  rm -f $(DESTDIR)$(exampledir)/$$f; \
 	done
-	-rm -f $(exampleimagedir)/$(HTMLEXAMPLEIMAGEFILES)
-	-rmdir $(exampleimagedir)
+	-rm -f $(DESTDIR)$(exampleimagedir)/$(HTMLEXAMPLEIMAGEFILES)
+	-rmdir $(DESTDIR)$(exampleimagedir)
diff --git a/m4/groff.m4 b/m4/groff.m4
index ce88f550..f2dc478b 100644
--- a/m4/groff.m4
+++ b/m4/groff.m4
@@ -1,5 +1,5 @@
 # Autoconf macros for groff.
-# Copyright (C) 1989-1995, 2001, 2002, 2003, 2004, 2005
+# Copyright (C) 1989-1995, 2001, 2002, 2003, 2004, 2005, 2006
 # Free Software Foundation, Inc.
 #
 # This file is part of groff.
@@ -1073,9 +1073,9 @@ AC_DEFUN([GROFF_X11],
 
 # Set up the `--with-appresdir' command line option.
 
+# Don't quote AS_HELP_STRING!
 AC_DEFUN([GROFF_APPRESDIR_OPTION],
   [AC_ARG_WITH([appresdir],
-     dnl Don't quote AS_HELP_STRING!
      AS_HELP_STRING([--with-appresdir=DIR],
 		    [X11 application resource files]))])
 
diff --git a/src/devices/xditview/Makefile.sub b/src/devices/xditview/Makefile.sub
index f4030209..51cfbf13 100644
--- a/src/devices/xditview/Makefile.sub
+++ b/src/devices/xditview/Makefile.sub
@@ -37,11 +37,14 @@ GXditview-ad.h: $(srcdir)/GXditview.ad
 	$(SHELL) $(srcdir)/ad2c $(srcdir)/GXditview.ad >GXditview-ad.h
 
 install_data: $(srcdir)/GXditview.ad
-	-test -d $(appresdir) || $(mkinstalldirs) $(appresdir)
-	if test -f $(appresdir)/GXditview; then \
-	  mv $(appresdir)/GXditview $(appresdir)/GXditview.old; \
+	-test -d $(DESTDIR)$(appresdir) \
+	  || $(mkinstalldirs) $(DESTDIR)$(appresdir)
+	if test -f $(DESTDIR)$(appresdir)/GXditview; then \
+	  mv $(DESTDIR)$(appresdir)/GXditview \
+	    $(DESTDIR)$(appresdir)/GXditview.old; \
 	fi
-	$(INSTALL_DATA) $(srcdir)/GXditview.ad $(appresdir)/GXditview
+	$(INSTALL_DATA) $(srcdir)/GXditview.ad \
+	  $(DESTDIR)$(appresdir)/GXditview
 
 uninstall_sub:
-	-rm -f $(appresdir)/GXditview
+	-rm -f $(DESTDIR)$(appresdir)/GXditview
diff --git a/src/preproc/eqn/Makefile.sub b/src/preproc/eqn/Makefile.sub
index 9028f94c..4f6a8e95 100644
--- a/src/preproc/eqn/Makefile.sub
+++ b/src/preproc/eqn/Makefile.sub
@@ -53,8 +53,8 @@ neqn: neqn.sh $(SH_DEPS_SED_SCRIPT)
 	chmod +x $@
 
 install_data: neqn
-	-rm -f $(bindir)/$(NAMEPREFIX)neqn
-	$(INSTALL_SCRIPT) neqn $(bindir)/$(NAMEPREFIX)neqn
+	-rm -f $(DESTDIR)$(bindir)/$(NAMEPREFIX)neqn
+	$(INSTALL_SCRIPT) neqn $(DESTDIR)$(bindir)/$(NAMEPREFIX)neqn
 
 uninstall_sub:
-	-rm -f $(bindir)/$(NAMEPREFIX)neqn
+	-rm -f $(DESTDIR)$(bindir)/$(NAMEPREFIX)neqn
diff --git a/src/roff/grog/Makefile.sub b/src/roff/grog/Makefile.sub
index d199ac95..43dec8fb 100644
--- a/src/roff/grog/Makefile.sub
+++ b/src/roff/grog/Makefile.sub
@@ -24,9 +24,9 @@ grog.old: grog.pl grog.sh
 	chmod +x $@
 
 install_data: grog
-	-test -d $(bindir) || $(mkinstalldirs) $(bindir)
-	-rm -f $(bindir)/grog
-	$(INSTALL_SCRIPT) grog $(bindir)/grog
+	-test -d $(DESTDIR)$(bindir) || $(mkinstalldirs) $(DESTDIR)$(bindir)
+	-rm -f $(DESTDIR)$(bindir)/grog
+	$(INSTALL_SCRIPT) grog $(DESTDIR)$(bindir)/grog
 
 uninstall_sub:
-	-rm -f $(bindir)/grog
+	-rm -f $(DESTDIR)$(bindir)/grog
diff --git a/src/roff/nroff/Makefile.sub b/src/roff/nroff/Makefile.sub
index ffd2ccd8..08b661cf 100644
--- a/src/roff/nroff/Makefile.sub
+++ b/src/roff/nroff/Makefile.sub
@@ -12,9 +12,9 @@ nroff: nroff.sh $(SH_DEPS_SED_SCRIPT)
 	chmod +x $@
 
 install_data: nroff
-	-test -d $(bindir) || $(mkinstalldirs) $(bindir)
-	-rm -f $(bindir)/$(NAMEPREFIX)nroff
-	$(INSTALL_SCRIPT) nroff $(bindir)/$(NAMEPREFIX)nroff
+	-test -d $(DESTDIR)$(bindir) || $(mkinstalldirs) $(DESTDIR)$(bindir)
+	-rm -f $(DESTDIR)$(bindir)/$(NAMEPREFIX)nroff
+	$(INSTALL_SCRIPT) nroff $(DESTDIR)$(bindir)/$(NAMEPREFIX)nroff
 
 uninstall_sub:
-	-rm -f $(bindir)/$(NAMEPREFIX)nroff
+	-rm -f $(DESTDIR)$(bindir)/$(NAMEPREFIX)nroff
diff --git a/src/utils/afmtodit/Makefile.sub b/src/utils/afmtodit/Makefile.sub
index 0ec4b2d6..75d1466a 100644
--- a/src/utils/afmtodit/Makefile.sub
+++ b/src/utils/afmtodit/Makefile.sub
@@ -21,9 +21,9 @@ afmtodit: afmtodit.pl afmtodit.tables
 	chmod +x afmtodit
 
 install_data: afmtodit
-	-test -d $(bindir) || $(mkinstalldirs) $(bindir)
-	-rm -f $(bindir)/afmtodit
-	$(INSTALL_SCRIPT) afmtodit $(bindir)/afmtodit
+	-test -d $(DESTDIR)$(bindir) || $(mkinstalldirs) $(DESTDIR)$(bindir)
+	-rm -f $(DESTDIR)$(bindir)/afmtodit
+	$(INSTALL_SCRIPT) afmtodit $(DESTDIR)$(bindir)/afmtodit
 
 uninstall_sub:
-	-rm -f $(bindir)/afmtodit
+	-rm -f $(DESTDIR)$(bindir)/afmtodit
diff --git a/src/utils/indxbib/Makefile.sub b/src/utils/indxbib/Makefile.sub
index e8f1e6f2..3b840083 100644
--- a/src/utils/indxbib/Makefile.sub
+++ b/src/utils/indxbib/Makefile.sub
@@ -12,18 +12,21 @@ CSRCS=\
 NAMEPREFIX=$(g)
 
 install_data: $(srcdir)/eign
-	-test -d $(datadir) || $(mkinstalldirs) $(datadir)
-	-test -d $(dataprogramdir) || $(mkinstalldirs) $(dataprogramdir)
-	-test -d $(datasubdir) || $(mkinstalldirs) $(datasubdir)
+	-test -d $(DESTDIR)$(datadir) \
+	  || $(mkinstalldirs) $(DESTDIR)$(datadir)
+	-test -d $(DESTDIR)$(dataprogramdir) \
+	  || $(mkinstalldirs) $(DESTDIR)$(dataprogramdir)
+	-test -d $(DESTDIR)$(datasubdir) \
+	  || $(mkinstalldirs) $(DESTDIR)$(datasubdir)
 	if test -f /usr/lib/eign; then \
-	  rm -f $(common_words_file); \
-	  ln -s /usr/lib/eign $(common_words_file) 2>/dev/null \
-	  || ln /usr/lib/eign $(common_words_file) 2>/dev/null \
-	  || cp /usr/lib/eign $(common_words_file); \
+	  rm -f $(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 $(common_words_file); \
-	  $(INSTALL_DATA) $(srcdir)/eign $(common_words_file); \
+	  rm -f $(DESTDIR)$(common_words_file); \
+	  $(INSTALL_DATA) $(srcdir)/eign $(DESTDIR)$(common_words_file); \
 	fi
 
 uninstall_sub:
-	-rm -f $(common_words_file)
+	-rm -f $(DESTDIR)$(common_words_file)
diff --git a/tmac/Makefile.sub b/tmac/Makefile.sub
index 21e41f55..5fd46fe9 100644
--- a/tmac/Makefile.sub
+++ b/tmac/Makefile.sub
@@ -48,41 +48,47 @@ all: stamp-strip stamp-wrap stamp-sed
 
 install_data: $(NORMALFILES) $(SPECIALFILES) man.local \
               stamp-strip stamp-wrap stamp-sed
-	-test -d $(tmacdir) || $(mkinstalldirs) $(tmacdir)
-	-test -d $(systemtmacdir) || $(mkinstalldirs) $(systemtmacdir)
-	-test -d $(localtmacdir) || $(mkinstalldirs) $(localtmacdir)
+	-test -d $(DESTDIR)$(tmacdir) \
+	  || $(mkinstalldirs) $(DESTDIR)$(tmacdir)
+	-test -d $(DESTDIR)$(systemtmacdir) \
+	  || $(mkinstalldirs) $(DESTDIR)$(systemtmacdir)
+	-test -d $(DESTDIR)$(localtmacdir) \
+	  || $(mkinstalldirs) $(DESTDIR)$(localtmacdir)
 	if test -n "$(tmac_wrap)"; then \
 	  for m in ""$(tmac_wrap); do \
-	    $(INSTALL_DATA) $$m-wrap $(systemtmacdir)/$$m.tmac; \
+	    $(INSTALL_DATA) $$m-wrap $(DESTDIR)$(systemtmacdir)/$$m.tmac; \
 	  done; \
 	fi
 	for f in $(NORMALFILES); do \
-	  rm -f $(tmacdir)/$$f; \
-	  $(INSTALL_DATA) $(srcdir)/$$f $(tmacdir)/$$f; \
+	  rm -f $(DESTDIR)$(tmacdir)/$$f; \
+	  $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(tmacdir)/$$f; \
 	done
-	-rm -f $(tmacdir)/$(tmac_s_prefix)s.tmac
-	$(INSTALL_DATA) $(srcdir)/s.tmac $(tmacdir)/$(tmac_s_prefix)s.tmac
-	-rm -f $(tmacdir)/ms.tmac
-	$(INSTALL_DATA) ms.tmac-sed $(tmacdir)/ms.tmac
-	-rm -f $(tmacdir)/$(tmac_an_prefix)an.tmac
-	$(INSTALL_DATA) $(srcdir)/an.tmac $(tmacdir)/$(tmac_an_prefix)an.tmac
-	-rm -f $(tmacdir)/man.tmac
-	$(INSTALL_DATA) man.tmac-sed $(tmacdir)/man.tmac
-	-rm -f $(tmacdir)/www.tmac
-	$(INSTALL_DATA) www.tmac-sed $(tmacdir)/www.tmac
+	-rm -f $(DESTDIR)$(tmacdir)/$(tmac_s_prefix)s.tmac
+	$(INSTALL_DATA) $(srcdir)/s.tmac \
+	  $(DESTDIR)$(tmacdir)/$(tmac_s_prefix)s.tmac
+	-rm -f $(DESTDIR)$(tmacdir)/ms.tmac
+	$(INSTALL_DATA) ms.tmac-sed $(DESTDIR)$(tmacdir)/ms.tmac
+	-rm -f $(DESTDIR)$(tmacdir)/$(tmac_an_prefix)an.tmac
+	$(INSTALL_DATA) $(srcdir)/an.tmac \
+	  $(DESTDIR)$(tmacdir)/$(tmac_an_prefix)an.tmac
+	-rm -f $(DESTDIR)$(tmacdir)/man.tmac
+	$(INSTALL_DATA) man.tmac-sed $(DESTDIR)$(tmacdir)/man.tmac
+	-rm -f $(DESTDIR)$(tmacdir)/www.tmac
+	$(INSTALL_DATA) www.tmac-sed $(DESTDIR)$(tmacdir)/www.tmac
 	for f in $(STRIPFILES); do \
-	  rm -f $(tmacdir)/$$f; \
-	  $(INSTALL_DATA) $$f-s $(tmacdir)/$$f; \
+	  rm -f $(DESTDIR)$(tmacdir)/$$f; \
+	  $(INSTALL_DATA) $$f-s $(DESTDIR)$(tmacdir)/$$f; \
 	done
-	-test -d $(mdocdir) || $(mkinstalldirs) $(mdocdir)
+	-test -d $(DESTDIR)$(mdocdir) || $(mkinstalldirs) $(DESTDIR)$(mdocdir)
 	for f in $(MDOCFILES); do \
-	  rm -f $(mdocdir)/$$f; \
-	  $(INSTALL_DATA) $$f-s $(mdocdir)/$$f; \
+	  rm -f $(DESTDIR)$(mdocdir)/$$f; \
+	  $(INSTALL_DATA) $$f-s $(DESTDIR)$(mdocdir)/$$f; \
 	done
-	-test -f $(localtmacdir)/man.local || \
-	  $(INSTALL_DATA) $(srcdir)/man.local $(localtmacdir)/man.local
-	-test -f $(localtmacdir)/mdoc.local || \
-	  $(INSTALL_DATA) mdoc.local-s $(localtmacdir)/mdoc.local
+	-test -f $(DESTDIR)$(localtmacdir)/man.local || \
+	  $(INSTALL_DATA) $(srcdir)/man.local \
+	    $(DESTDIR)$(localtmacdir)/man.local
+	-test -f $(DESTDIR)$(localtmacdir)/mdoc.local || \
+	  $(INSTALL_DATA) mdoc.local-s $(DESTDIR)$(localtmacdir)/mdoc.local
 
 stamp-strip: $(STRIPFILES) $(MDOCFILES) mdoc.local
 	for f in $(STRIPFILES) $(MDOCFILES) mdoc.local; do \
@@ -117,21 +123,23 @@ stamp-sed: man.tmac ms.tmac www.tmac
 uninstall_sub:
 	-if test -n "$(tmac_wrap)"; then \
 	  for m in ""$(tmac_wrap); do \
-	    rm -f $(systemtmacdir)/$$m.tmac; \
+	    rm -f $(DESTDIR)$(systemtmacdir)/$$m.tmac; \
 	  done; \
 	fi
 	-for f in $(NORMALFILES) $(STRIPFILES); do \
-	  rm -f $(tmacdir)/$$f; \
+	  rm -f $(DESTDIR)$(tmacdir)/$$f; \
 	done
-	-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; \
+	-rm -f $(DESTDIR)$(tmacdir)/$(tmac_s_prefix)s.tmac
+	-rm -f $(DESTDIR)$(tmacdir)/$(tmac_an_prefix)an.tmac
+	-rm -f $(DESTDIR)$(tmacdir)/man.tmac $(DESTDIR)$(tmacdir)/ms.tmac
+	-rm -f $(DESTDIR)$(tmacdir)/www.tmac
+	-if cmp -s $(DESTDIR)$(localtmacdir)/man.local \
+	           $(srcdir)/man.local; then \
+	  rm -f $(DESTDIR)$(localtmacdir)/man.local; \
 	fi
-	-if cmp -s $(localtmacdir)/mdoc.local $(srcdir)/mdoc.local; then \
-	  rm -f $(localtmacdir)/mdoc.local; \
+	-if cmp -s $(DESTDIR)$(localtmacdir)/mdoc.local \
+	           $(srcdir)/mdoc.local; then \
+	  rm -f $(DESTDIR)$(localtmacdir)/mdoc.local; \
 	fi
-	-for f in $(MDOCFILES); do rm -f $(mdocdir)/$$f; done
-	-rmdir $(mdocdir)
+	-for f in $(MDOCFILES); do rm -f $(DESTDIR)$(mdocdir)/$$f; done
+	-rmdir $(DESTDIR)$(mdocdir)
-- 
cgit v1.2.1