* 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.

6 files changed, 36 insertions, 30 deletions

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)