[packages/groff.git] / groff-DESTDIR.patch

diff -Nur groff-1.18.orig/Makefile.comm groff-1.18/Makefile.comm
--- groff-1.18.orig/Makefile.comm	Mon Jun  3 18:01:41 2002
+++ groff-1.18/Makefile.comm	Mon Jul 29 14:46:37 2002
@@ -163,29 +163,25 @@
 
 .PHONY: install_man
 install_man:
-	-test -d $(manroot) || $(mkinstalldirs) $(manroot)
-	-test -d $(man1dir) || $(mkinstalldirs) $(man1dir)
+	$(mkinstalldirs) $(DESTDIR)$(man1dir)
+	$(mkinstalldirs) $(DESTDIR)$(man5dir)
+	$(mkinstalldirs) $(DESTDIR)$(man7dir)
 	@-pages="$(MAN1)"; \
 	for p in $$pages; do \
 	 prog=`basename $$p .n`; \
-	 target=$(man1dir)/$(NAMEPREFIX)$$prog.$(man1ext); \
-	 rm -f $$target; \
+	 target=$(DESTDIR)$(man1dir)/$(NAMEPREFIX)$$prog.$(man1ext); \
 	 echo $(INSTALL_DATA) $$p $$target; \
 	 $(INSTALL_DATA) $$p $$target; \
 	done
-	-test -d $(man5dir) || $(mkinstalldirs) $(man5dir)
 	@-pages="$(MAN5)"; \
 	for p in $$pages; do \
-	 target=$(man5dir)/`basename $$p .n`.$(man5ext); \
-	 rm -f $$target; \
+	 target=$(DESTDIR)$(man5dir)/`basename $$p .n`.$(man5ext); \
 	 echo $(INSTALL_DATA) $$p $$target; \
 	 $(INSTALL_DATA) $$p $$target; \
 	done
-	-test -d $(man7dir) || $(mkinstalldirs) $(man7dir)
 	@-pages="$(MAN7)"; \
 	for p in $$pages; do \
-	 target=$(man7dir)/`basename $$p .n`.$(man7ext); \
-	 rm -f $$target; \
+	 target=$(DESTDIR)$(man7dir)/`basename $$p .n`.$(man7ext); \
 	 echo $(INSTALL_DATA) $$p $$target; \
 	 $(INSTALL_DATA) $$p $$target; \
 	done
@@ -213,9 +209,8 @@
 
 .PHONY: install_prog
 install_prog:
-	-test -d $(bindir) || $(mkinstalldirs) $(bindir)
-	rm -f $(bindir)/$(NAMEPREFIX)$(PROG)
-	$(INSTALL_PROGRAM) $(PROG) $(bindir)/$(NAMEPREFIX)$(PROG)
+	$(mkinstalldirs) $(DESTDIR)$(bindir)
+	$(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(bindir)/$(NAMEPREFIX)$(PROG)
 
 .PHONY: uninstall_prog
 uninstall_prog:
@@ -223,21 +218,16 @@
 
 .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)
-	-if test -d $(srcdir)/generate; then \
-	  test -d $(fontsubdir)/generate || \
-	    $(mkinstalldirs) $(fontsubdir)/generate; \
-	fi
+	$(mkinstalldirs) $(DESTDIR)$(datadir)
+	$(mkinstalldirs) $(DESTDIR)$(dataprogramdir)
+	$(mkinstalldirs) $(DESTDIR)$(datasubdir)
+	$(mkinstalldirs) $(DESTDIR)$(fontdir)
+	$(mkinstalldirs) $(DESTDIR)$(fontsubdir)/generate
 	-for f in $(DEVFILES); do \
-	  rm -f $(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
 
diff -Nur groff-1.18.orig/contrib/mm/Makefile.sub groff-1.18/contrib/mm/Makefile.sub
--- groff-1.18.orig/contrib/mm/Makefile.sub	Wed May 22 08:26:12 2002
+++ groff-1.18/contrib/mm/Makefile.sub	Mon Jul 29 14:50:50 2002
@@ -17,31 +17,27 @@
 install: install_mm
 
 install_mm: install_mmroff install_m
-	-test -d $(tmacdir)/mm || $(mkinstalldirs) $(tmacdir)/mm
+	$(mkinstalldirs) $(DESTDIR)$(tmacdir)/mm
 	-for f in $(FILES); do \
-		rm -f $(tmacdir)/mm/$$f; \
-		$(INSTALL_DATA) $(srcdir)/mm/$$f $(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
+	$(mkinstalldirs) $(DESTDIR)$(tmacdir)
+	$(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
+	$(mkinstalldirs) $(DESTDIR)$(bindir)
+	$(INSTALL_SCRIPT) mmroff $(DESTDIR)$(bindir)/mmroff
 
 mmroff: mmroff.pl
 	-rm -f $@
diff -Nur groff-1.18.orig/doc/Makefile.sub groff-1.18/doc/Makefile.sub
--- groff-1.18.orig/doc/Makefile.sub	Fri Jun 14 17:18:34 2002
+++ groff-1.18/doc/Makefile.sub	Mon Jul 29 14:57:57 2002
@@ -133,52 +133,42 @@
 
 install_data: groff $(DOCFILES) $(PROCESSEDDOCFILES) $(make_install_html) \
               $(EXAMPLEFILES) $(PROCESSEDEXAMPLEFILES)
-	-test -d $(infodir) || $(mkinstalldirs) $(infodir)
+	$(mkinstalldirs) $(DESTDIR)$(infodir)
 # Prefer info files in builddir over srcdir; we test for
 # the existence of `groff'.
 	d=.; \
-	  test -f "groff" || d=$(srcdir); \
-	  for f in $$d/groff $$d/groff-*; do \
-	    rm -f $(infodir)/`basename $$f`; \
-	    $(INSTALL_DATA) $$f $(infodir)/`basename $$f`; \
+	  test -f "groff.info" || d=$(srcdir); \
+	  for f in $$d/groff.info* ; do \
+	    $(INSTALL_DATA) $$f $(DESTDIR)$(infodir)/`basename $$f`; \
 	  done
-	$(INSTALL_INFO) --info-dir=$(infodir) $(infodir)/groff
-	-test -d $(docdir) || $(mkinstalldirs) $(docdir)
+	$(mkinstalldirs) $(DESTDIR)$(docdir)
 	for f in $(DOCFILES); do \
-	  rm -f $(docdir)/$$f; \
-	  $(INSTALL_DATA) $(srcdir)/$$f $(docdir)/$$f; \
+	  $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(docdir)/$$f; \
 	done
 	for f in $(PROCESSEDDOCFILES); do \
-	  rm -f $(docdir)/$$f; \
-	  $(INSTALL_DATA) $$f $(docdir)/$$f; \
+	  $(INSTALL_DATA) $$f $(DESTDIR)$(docdir)/$$f; \
 	done
-	-test -d $(exampledir) || $(mkinstalldirs) $(exampledir)
+	$(mkinstalldirs) $(DESTDIR)$(exampledir)
 	for f in $(EXAMPLEFILES); do \
-	  rm -f $(exampledir)/$$f; \
-	  $(INSTALL_DATA) $(srcdir)/$$f $(exampledir)/$$f; \
+	  $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(exampledir)/$$f; \
 	done
 	for f in $(PROCESSEDEXAMPLEFILES); do \
-	  rm -f $(exampledir)/$$f; \
-	  $(INSTALL_DATA) $$f $(exampledir)/$$f; \
+	  $(INSTALL_DATA) $$f $(DESTDIR)$(exampledir)/$$f; \
 	done
 
 install_html: $(HTMLDOCFILES) $(HTMLEXAMPLEFILES)
-	-test -d $(htmldocdir) || $(mkinstalldirs) $(htmldocdir)
+	$(mkinstalldirs) $(DESTDIR)$(htmldocdir)
 	for f in $(HTMLDOCFILES); do \
-	  rm -f $(htmldocdir)/$$f; \
-	  $(INSTALL_DATA) $$f $(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)
+	$(mkinstalldirs) $(DESTDIR)$(htmldocimagedir)
+	$(INSTALL_DATA) $(imagedir)/$(HTMLDOCIMAGEFILES) $(DESTDIR)$(htmldocimagedir)
+	$(mkinstalldirs) $(DESTDIR)$(exampledir)
 	for f in $(HTMLEXAMPLEFILES); do \
-	  rm -f $(exampledir)/$$f; \
-	  $(INSTALL_DATA) $$f $(exampledir)/$$f; \
+	  $(INSTALL_DATA) $$f $(DESTDIR)$(exampledir)/$$f; \
 	done
-	-test -d $(exampleimagedir) || $(mkinstalldirs) $(exampleimagedir)
-	rm -f $(exampleimagedir)/$(HTMLEXAMPLEIMAGEFILES)
-	$(INSTALL_DATA) $(imagedir)/$(HTMLEXAMPLEIMAGEFILES) $(exampleimagedir)
+	$(mkinstalldirs) $(DESTDIR)$(exampleimagedir)
+	$(INSTALL_DATA) $(imagedir)/$(HTMLEXAMPLEIMAGEFILES) $(DESTDIR)$(exampleimagedir)
 
 uninstall_sub:
 	-for f in groff groff-*; do \
diff -Nur groff-1.18.orig/src/preproc/eqn/Makefile.sub groff-1.18/src/preproc/eqn/Makefile.sub
--- groff-1.18.orig/src/preproc/eqn/Makefile.sub	Sun Jun  2 18:42:56 2002
+++ groff-1.18/src/preproc/eqn/Makefile.sub	Mon Jul 29 14:58:47 2002
@@ -52,8 +52,7 @@
 	chmod +x $@
 
 install_data: neqn
-	-rm -f $(bindir)/$(NAMEPREFIX)neqn
-	$(INSTALL_SCRIPT) neqn $(bindir)/$(NAMEPREFIX)neqn
+	$(INSTALL_SCRIPT) neqn $(DESTDIR)$(bindir)/$(NAMEPREFIX)neqn
 
 uninstall_sub:
 	-rm -f $(bindir)/$(NAMEPREFIX)neqn
diff -Nur groff-1.18.orig/src/roff/grog/Makefile.sub groff-1.18/src/roff/grog/Makefile.sub
--- groff-1.18.orig/src/roff/grog/Makefile.sub	Fri Jun 14 12:44:00 2002
+++ groff-1.18/src/roff/grog/Makefile.sub	Mon Jul 29 14:59:05 2002
@@ -24,9 +24,8 @@
 	chmod +x $@
 
 install_data: grog
-	-test -d $(bindir) || $(mkinstalldirs) $(bindir)
-	-rm -f $(bindir)/grog
-	$(INSTALL_SCRIPT) grog $(bindir)/grog
+	$(mkinstalldirs) $(DESTDIR)$(bindir)
+	$(INSTALL_SCRIPT) grog $(DESTDIR)$(bindir)/grog
 
 uninstall_sub:
 	-rm -f $(bindir)/grog
diff -Nur groff-1.18.orig/src/roff/nroff/Makefile.sub groff-1.18/src/roff/nroff/Makefile.sub
--- groff-1.18.orig/src/roff/nroff/Makefile.sub	Thu Nov 16 22:10:44 2000
+++ groff-1.18/src/roff/nroff/Makefile.sub	Mon Jul 29 14:59:55 2002
@@ -12,9 +12,8 @@
 	chmod +x $@
 
 install_data: nroff
-	-test -d $(bindir) || $(mkinstalldirs) $(bindir)
-	-rm -f $(bindir)/$(NAMEPREFIX)nroff
-	$(INSTALL_SCRIPT) nroff $(bindir)/$(NAMEPREFIX)nroff
+	$(mkinstalldirs) $(DESTDIR)$(bindir)
+	$(INSTALL_SCRIPT) nroff $(DESTDIR)$(bindir)/$(NAMEPREFIX)nroff
 
 uninstall_sub:
 	-rm -f $(bindir)/$(NAMEPREFIX)nroff
diff -Nur groff-1.18.orig/src/utils/afmtodit/Makefile.sub groff-1.18/src/utils/afmtodit/Makefile.sub
--- groff-1.18.orig/src/utils/afmtodit/Makefile.sub	Thu Nov 16 22:10:46 2000
+++ groff-1.18/src/utils/afmtodit/Makefile.sub	Mon Jul 29 15:00:27 2002
@@ -15,9 +15,8 @@
 	chmod +x afmtodit
 
 install_data: afmtodit
-	-test -d $(bindir) || $(mkinstalldirs) $(bindir)
-	-rm -f $(bindir)/afmtodit
-	$(INSTALL_SCRIPT) afmtodit $(bindir)/afmtodit
+	$(mkinstalldirs) $(DESTDIR)$(bindir)
+	$(INSTALL_SCRIPT) afmtodit $(DESTDIR)$(bindir)/afmtodit
 
 uninstall_sub:
 	-rm -f $(bindir)/afmtodit
diff -Nur groff-1.18.orig/src/utils/indxbib/Makefile.sub groff-1.18/src/utils/indxbib/Makefile.sub
--- groff-1.18.orig/src/utils/indxbib/Makefile.sub	Fri May  3 00:33:22 2002
+++ groff-1.18/src/utils/indxbib/Makefile.sub	Mon Jul 29 15:01:35 2002
@@ -12,18 +12,10 @@
 NAMEPREFIX=$(g)
 
 install_data: eign
-	-test -d $(datadir) || $(mkinstalldirs) $(datadir)
-	-test -d $(dataprogramdir) || $(mkinstalldirs) $(dataprogramdir)
-	-test -d $(datasubdir) || $(mkinstalldirs) $(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); \
-	else \
-	  rm -f $(common_words_file); \
-	  $(INSTALL_DATA) $(srcdir)/eign $(common_words_file); \
-	fi
+	$(mkinstalldirs) $(DESTDIR)$(datadir)
+	$(mkinstalldirs) $(DESTDIR)$(dataprogramdir)
+	$(mkinstalldirs) $(DESTDIR)$(datasubdir)
+	$(INSTALL_DATA) $(srcdir)/eign $(DESTDIR)$(common_words_file)
 
 uninstall_sub:
 	-rm -f $(common_words_file)
diff -Nur groff-1.18.orig/tmac/Makefile.sub groff-1.18/tmac/Makefile.sub
--- groff-1.18.orig/tmac/Makefile.sub	Sat Jul 13 22:41:16 2002
+++ groff-1.18/tmac/Makefile.sub	Mon Jul 29 15:04:07 2002
@@ -43,39 +43,30 @@
 
 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)
+	$(mkinstalldirs) $(DESTDIR)$(tmacdir)
+	$(mkinstalldirs) $(DESTDIR)$(systemtmacdir)
+	$(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; \
+	  $(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
+	$(INSTALL_DATA) $(srcdir)/s.tmac $(DESTDIR)$(tmacdir)/$(tmac_s_prefix)s.tmac
+	$(INSTALL_DATA) ms.tmac-sed $(DESTDIR)$(tmacdir)/ms.tmac
+	$(INSTALL_DATA) $(srcdir)/an.tmac $(DESTDIR)$(tmacdir)/$(tmac_an_prefix)an.tmac
+	$(INSTALL_DATA) man.tmac-sed $(DESTDIR)$(tmacdir)/man.tmac
 	for f in $(STRIPFILES); do \
-	  rm -f $(tmacdir)/$$f; \
-	  $(INSTALL_DATA) $$f-s $(tmacdir)/$$f; \
+	  $(INSTALL_DATA) $$f-s $(DESTDIR)$(tmacdir)/$$f; \
 	done
-	-test -d $(mdocdir) || $(mkinstalldirs) $(mdocdir)
+	$(mkinstalldirs) $(DESTDIR)$(mdocdir)
 	for f in $(MDOCFILES); do \
-	  rm -f $(mdocdir)/$$f; \
-	  $(INSTALL_DATA) $$f-s $(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
+	$(INSTALL_DATA) $(srcdir)/man.local $(DESTDIR)$(localtmacdir)/man.local
+	$(INSTALL_DATA) mdoc.local-s $(DESTDIR)$(localtmacdir)/mdoc.local
 
 stamp-strip: $(STRIPFILES) $(MDOCFILES) mdoc.local
 	for f in $(STRIPFILES) $(MDOCFILES) mdoc.local; do \
--- groff-1.18.orig/contrib/eqn2graph/Makefile.sub	Mon Jul  8 00:14:56 2002
+++ groff-1.18/contrib/eqn2graph/Makefile.sub	Mon Jul 29 15:12:05 2002
@@ -11,9 +11,8 @@
 	chmod +x $@
 
 install_data: eqn2graph
-	-test -d $(bindir) || $(mkinstalldirs) $(bindir)
-	-rm -f $(bindir)/eqn2graph
-	$(INSTALL_SCRIPT) eqn2graph $(bindir)/eqn2graph
+	$(mkinstalldirs) $(DESTDIR)$(bindir)
+	$(INSTALL_SCRIPT) eqn2graph $(DESTDIR)$(bindir)/eqn2graph
 
 uninstall_sub:
 	-rm -f $(bindir)/eqn2graph
--- groff-1.18.orig/contrib/mom/Makefile.sub	Fri Jun  7 13:56:32 2002
+++ groff-1.18/contrib/mom/Makefile.sub	Mon Jul 29 15:13:36 2002
@@ -90,24 +90,20 @@
 
 install_data: $(NORMALFILES) $(HTMLDOCFILES) \
               $(EXAMPLEFILES) $(PROCESSEDEXAMPLEFILES)
-	-test -d $(tmacdir) || $(mkinstalldirs) $(tmacdir)
+	$(mkinstalldirs) $(DESTDIR)$(tmacdir)
 	for f in $(NORMALFILES); do \
-	  rm -f $(tmacdir)/$$f; \
-	  $(INSTALL_DATA) $(srcdir)/$$f $(tmacdir)/$$f; \
+	  $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(tmacdir)/$$f; \
 	done
-	-test -d $(htmldocdir)/momdoc || $(mkinstalldirs) $(htmldocdir)/momdoc
+	$(mkinstalldirs) $(DESTDIR)$(htmldocdir)/momdoc
 	for f in $(HTMLDOCFILES); do \
-	  rm -f $(htmldocdir)/$$f; \
-	  $(INSTALL_DATA) $(srcdir)/$$f $(htmldocdir)/$$f; \
+	  $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(htmldocdir)/$$f; \
 	done
-	-test -d $(exampledir) || $(mkinstalldirs) $(exampledir)
+	$(mkinstalldirs) $(DESTDIR)$(exampledir)
 	for f in $(EXAMPLEFILES); do \
-	  rm -f $(exampledir)/$$f; \
-	  $(INSTALL_DATA) $(srcdir)/$$f $(docdir)/$$f; \
+	  $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(docdir)/$$f; \
 	done
 	for f in $(PROCESSEDEXAMPLEFILES); do \
-	  rm -f $(exampledir)/$$f; \
-	  $(INSTALL_DATA) $$f $(docdir)/$$f; \
+	  $(INSTALL_DATA) $$f $(DESTDIR)$(docdir)/$$f; \
 	done
 
 uninstall_sub:
--- groff-1.18.orig/contrib/pic2graph/Makefile.sub	Sat Aug 11 00:16:11 2001
+++ groff-1.18/contrib/pic2graph/Makefile.sub	Mon Jul 29 15:13:54 2002
@@ -11,9 +11,8 @@
 	chmod +x $@
 
 install_data: pic2graph
-	-test -d $(bindir) || $(mkinstalldirs) $(bindir)
-	-rm -f $(bindir)/pic2graph
-	$(INSTALL_SCRIPT) pic2graph $(bindir)/pic2graph
+	$(mkinstalldirs) $(DESTDIR)$(bindir)
+	$(INSTALL_SCRIPT) pic2graph $(DESTDIR)$(bindir)/pic2graph
 
 uninstall_sub:
 	-rm -f $(bindir)/pic2graph
Commit	Line	Data
b0092f3d JR	1	diff -Nur groff-1.18.orig/Makefile.comm groff-1.18/Makefile.comm
	2	--- groff-1.18.orig/Makefile.comm Mon Jun 3 18:01:41 2002
	3	+++ groff-1.18/Makefile.comm Mon Jul 29 14:46:37 2002
	4	@@ -163,29 +163,25 @@
9564659a	5
	6	.PHONY: install_man
	7	install_man:
f3ffa96d	8	- -test -d $(manroot) \|\| $(mkinstalldirs) $(manroot)
	9	- -test -d $(man1dir) \|\| $(mkinstalldirs) $(man1dir)
	10	+ $(mkinstalldirs) $(DESTDIR)$(man1dir)
	11	+ $(mkinstalldirs) $(DESTDIR)$(man5dir)
	12	+ $(mkinstalldirs) $(DESTDIR)$(man7dir)
9564659a	13	@-pages="$(MAN1)"; \
	14	for p in $$pages; do \
	15	prog=`basename $$p .n`; \
	16	- target=$(man1dir)/$(NAMEPREFIX)$$prog.$(man1ext); \
f3ffa96d	17	- rm -f $$target; \
9564659a	18	+ target=$(DESTDIR)$(man1dir)/$(NAMEPREFIX)$$prog.$(man1ext); \
9564659a	19	echo $(INSTALL_DATA) $$p $$target; \
	20	$(INSTALL_DATA) $$p $$target; \
	21	done
f3ffa96d	22	- -test -d $(man5dir) \|\| $(mkinstalldirs) $(man5dir)
9564659a	23	@-pages="$(MAN5)"; \
	24	for p in $$pages; do \
	25	- target=$(man5dir)/`basename $$p .n`.$(man5ext); \
f3ffa96d	26	- rm -f $$target; \
9564659a	27	+ target=$(DESTDIR)$(man5dir)/`basename $$p .n`.$(man5ext); \
9564659a	28	echo $(INSTALL_DATA) $$p $$target; \
	29	$(INSTALL_DATA) $$p $$target; \
	30	done
f3ffa96d	31	- -test -d $(man7dir) \|\| $(mkinstalldirs) $(man7dir)
9564659a	32	@-pages="$(MAN7)"; \
	33	for p in $$pages; do \
	34	- target=$(man7dir)/`basename $$p .n`.$(man7ext); \
f3ffa96d	35	- rm -f $$target; \
9564659a	36	+ target=$(DESTDIR)$(man7dir)/`basename $$p .n`.$(man7ext); \
9564659a	37	echo $(INSTALL_DATA) $$p $$target; \
9564659a	38	$(INSTALL_DATA) $$p $$target; \
f3ffa96d	39	done
b0092f3d	40	@@ -213,9 +209,8 @@
9564659a	41
	42	.PHONY: install_prog
	43	install_prog:
f3ffa96d	44	- -test -d $(bindir) \|\| $(mkinstalldirs) $(bindir)
9564659a	45	- rm -f $(bindir)/$(NAMEPREFIX)$(PROG)
9564659a	46	- $(INSTALL_PROGRAM) $(PROG) $(bindir)/$(NAMEPREFIX)$(PROG)
f3ffa96d	47	+ $(mkinstalldirs) $(DESTDIR)$(bindir)
9564659a	48	+ $(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(bindir)/$(NAMEPREFIX)$(PROG)
	49
	50	.PHONY: uninstall_prog
	51	uninstall_prog:
b0092f3d	52	@@ -223,21 +218,16 @@
9564659a	53
	54	.PHONY: install_dev
	55	install_dev:
f3ffa96d	56	- -test -d $(datadir) \|\| $(mkinstalldirs) $(datadir)
8cc6167a	57	- -test -d $(dataprogramdir) \|\| $(mkinstalldirs) $(dataprogramdir)
f3ffa96d	58	- -test -d $(datasubdir) \|\| $(mkinstalldirs) $(datasubdir)
	59	- -test -d $(fontdir) \|\| $(mkinstalldirs) $(fontdir)
	60	- -test -d $(fontsubdir) \|\| $(mkinstalldirs) $(fontsubdir)
b0092f3d JR	61	- -if test -d $(srcdir)/generate; then \
	62	- test -d $(fontsubdir)/generate \|\| \
	63	- $(mkinstalldirs) $(fontsubdir)/generate; \
	64	- fi
	65	+ $(mkinstalldirs) $(DESTDIR)$(datadir)
	66	+ $(mkinstalldirs) $(DESTDIR)$(dataprogramdir)
	67	+ $(mkinstalldirs) $(DESTDIR)$(datasubdir)
	68	+ $(mkinstalldirs) $(DESTDIR)$(fontdir)
	69	+ $(mkinstalldirs) $(DESTDIR)$(fontsubdir)/generate
	70	-for f in $(DEVFILES); do \
	71	- rm -f $(fontsubdir)/$$f; \
	72	if test -f $$f; then \
	73	- $(INSTALL_DATA) $$f $(fontsubdir)/$$f; \
	74	+ $(INSTALL_DATA) $$f $(DESTDIR)$(fontsubdir)/$$f; \
	75	else \
	76	- $(INSTALL_DATA) $(srcdir)/$$f $(fontsubdir)/$$f; \
	77	+ $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(fontsubdir)/$$f; \
	78	fi; \
	79	done
9564659a	80
b0092f3d JR	81	diff -Nur groff-1.18.orig/contrib/mm/Makefile.sub groff-1.18/contrib/mm/Makefile.sub
	82	--- groff-1.18.orig/contrib/mm/Makefile.sub Wed May 22 08:26:12 2002
	83	+++ groff-1.18/contrib/mm/Makefile.sub Mon Jul 29 14:50:50 2002
f0cb3a2e	84	@@ -17,31 +17,27 @@
9564659a	85	install: install_mm
9564659a	86
f3ffa96d	87	install_mm: install_mmroff install_m
	88	- -test -d $(tmacdir)/mm \|\| $(mkinstalldirs) $(tmacdir)/mm
	89	+ $(mkinstalldirs) $(DESTDIR)$(tmacdir)/mm
9564659a	90	-for f in $(FILES); do \
	91	- rm -f $(tmacdir)/mm/$$f; \
	92	- $(INSTALL_DATA) $(srcdir)/mm/$$f $(tmacdir)/mm/$$f; \
9564659a	93	+ $(INSTALL_DATA) $(srcdir)/mm/$$f $(DESTDIR)$(tmacdir)/mm/$$f; \
	94	done
	95	-for f in $(LOCALE); do \
	96	- test -f $(tmacdir)/mm/$$f \|\| touch $(tmacdir)/mm/$$f; \
8cc6167a	97	+ test -f $(DESTDIR)$(tmacdir)/mm/$$f \|\| touch $(DESTDIR)$(tmacdir)/mm/$$f; \
9564659a	98	done
	99
	100	install_m:
f3ffa96d	101	- -test -d $(tmacdir) \|\| $(mkinstalldirs) $(tmacdir)
f3ffa96d	102	- -rm -f $(tmacdir)/tmac.$(tmac_m_prefix)m
8cc6167a JB	103	- -rm -f $(tmacdir)/$(tmac_m_prefix)m.tmac
8cc6167a JB	104	- $(INSTALL_DATA) $(srcdir)/m.tmac $(tmacdir)/$(tmac_m_prefix)m.tmac
f3ffa96d	105	+ $(mkinstalldirs) $(DESTDIR)$(tmacdir)
8cc6167a JB	106	+ $(INSTALL_DATA) $(srcdir)/m.tmac $(DESTDIR)$(tmacdir)/$(tmac_m_prefix)m.tmac
	107	@sed -e "s;^.mso m.tmac;.mso $(tmac_m_prefix)m.tmac;g" \
	108	- $(srcdir)/mse.tmac > $(tmacdir)/$(tmac_m_prefix)mse.tmac
	109	+ $(srcdir)/mse.tmac > $(DESTDIR)$(tmacdir)/$(tmac_m_prefix)mse.tmac
f0cb3a2e JB	110	@sed -e "s;^.mso mse.tmac;.mso $(tmac_m_prefix)mse.tmac;g" \
	111	- $(srcdir)/mmse.tmac > $(tmacdir)/$(tmac_m_prefix)mmse.tmac
	112	+ $(srcdir)/mmse.tmac > $(DESTDIR)$(tmacdir)/$(tmac_m_prefix)mmse.tmac
	113	@sed -e "s;^.mso m.tmac;.mso $(tmac_m_prefix)m.tmac;g" \
	114	- $(srcdir)/mm.tmac > $(tmacdir)/$(tmac_m_prefix)mm.tmac
	115	+ $(srcdir)/mm.tmac > $(DESTDIR)$(tmacdir)/$(tmac_m_prefix)mm.tmac
	116
	117	install_mmroff: mmroff
f3ffa96d	118	- -test -d $(bindir) \|\| $(mkinstalldirs) $(bindir)
	119	- -rm -f $(bindir)/mmroff
	120	- $(INSTALL_SCRIPT) mmroff $(bindir)/mmroff
	121	+ $(mkinstalldirs) $(DESTDIR)$(bindir)
	122	+ $(INSTALL_SCRIPT) mmroff $(DESTDIR)$(bindir)/mmroff
9564659a	123
f3ffa96d	124	mmroff: mmroff.pl
f3ffa96d	125	-rm -f $@
b0092f3d JR	126	diff -Nur groff-1.18.orig/doc/Makefile.sub groff-1.18/doc/Makefile.sub
	127	--- groff-1.18.orig/doc/Makefile.sub Fri Jun 14 17:18:34 2002
	128	+++ groff-1.18/doc/Makefile.sub Mon Jul 29 14:57:57 2002
	129	@@ -133,52 +133,42 @@
f0cb3a2e JB	130
	131	install_data: groff $(DOCFILES) $(PROCESSEDDOCFILES) $(make_install_html) \
	132	$(EXAMPLEFILES) $(PROCESSEDEXAMPLEFILES)
	133	- -test -d $(infodir) \|\| $(mkinstalldirs) $(infodir)
b0092f3d	134	+ $(mkinstalldirs) $(DESTDIR)$(infodir)
f0cb3a2e JB	135	# Prefer info files in builddir over srcdir; we test for
	136	# the existence of `groff'.
	137	d=.; \
	138	- test -f "groff" \|\| d=$(srcdir); \
b0092f3d	139	- for f in $$d/groff $$d/groff-*; do \
f0cb3a2e JB	140	- rm -f $(infodir)/`basename $$f`; \
	141	- $(INSTALL_DATA) $$f $(infodir)/`basename $$f`; \
	142	+ test -f "groff.info" \|\| d=$(srcdir); \
b0092f3d	143	+ for f in $$d/groff.info* ; do \
f0cb3a2e JB	144	+ $(INSTALL_DATA) $$f $(DESTDIR)$(infodir)/`basename $$f`; \
	145	done
	146	- $(INSTALL_INFO) --info-dir=$(infodir) $(infodir)/groff
	147	- -test -d $(docdir) \|\| $(mkinstalldirs) $(docdir)
b0092f3d	148	+ $(mkinstalldirs) $(DESTDIR)$(docdir)
f0cb3a2e JB	149	for f in $(DOCFILES); do \
	150	- rm -f $(docdir)/$$f; \
	151	- $(INSTALL_DATA) $(srcdir)/$$f $(docdir)/$$f; \
	152	+ $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(docdir)/$$f; \
	153	done
	154	for f in $(PROCESSEDDOCFILES); do \
	155	- rm -f $(docdir)/$$f; \
	156	- $(INSTALL_DATA) $$f $(docdir)/$$f; \
	157	+ $(INSTALL_DATA) $$f $(DESTDIR)$(docdir)/$$f; \
	158	done
	159	- -test -d $(exampledir) \|\| $(mkinstalldirs) $(exampledir)
b0092f3d	160	+ $(mkinstalldirs) $(DESTDIR)$(exampledir)
f0cb3a2e JB	161	for f in $(EXAMPLEFILES); do \
	162	- rm -f $(exampledir)/$$f; \
	163	- $(INSTALL_DATA) $(srcdir)/$$f $(exampledir)/$$f; \
	164	+ $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(exampledir)/$$f; \
	165	done
	166	for f in $(PROCESSEDEXAMPLEFILES); do \
	167	- rm -f $(exampledir)/$$f; \
	168	- $(INSTALL_DATA) $$f $(exampledir)/$$f; \
	169	+ $(INSTALL_DATA) $$f $(DESTDIR)$(exampledir)/$$f; \
	170	done
	171
	172	install_html: $(HTMLDOCFILES) $(HTMLEXAMPLEFILES)
	173	- -test -d $(htmldocdir) \|\| $(mkinstalldirs) $(htmldocdir)
b0092f3d JR	174	+ $(mkinstalldirs) $(DESTDIR)$(htmldocdir)
b0092f3d JR	175	for f in $(HTMLDOCFILES); do \
f0cb3a2e JB	176	- rm -f $(htmldocdir)/$$f; \
	177	- $(INSTALL_DATA) $$f $(htmldocdir)/$$f; \
	178	+ $(INSTALL_DATA) $$f $(DESTDIR)$(htmldocdir)/$$f; \
	179	done
	180	- -test -d $(htmldocimagedir) \|\| $(mkinstalldirs) $(htmldocimagedir)
	181	- rm -f $(htmldocimagedir)/$(HTMLDOCIMAGEFILES)
	182	- $(INSTALL_DATA) $(imagedir)/$(HTMLDOCIMAGEFILES) $(htmldocimagedir)
	183	- -test -d $(exampledir) \|\| $(mkinstalldirs) $(exampledir)
b0092f3d	184	+ $(mkinstalldirs) $(DESTDIR)$(htmldocimagedir)
f0cb3a2e	185	+ $(INSTALL_DATA) $(imagedir)/$(HTMLDOCIMAGEFILES) $(DESTDIR)$(htmldocimagedir)
b0092f3d	186	+ $(mkinstalldirs) $(DESTDIR)$(exampledir)
f0cb3a2e JB	187	for f in $(HTMLEXAMPLEFILES); do \
	188	- rm -f $(exampledir)/$$f; \
	189	- $(INSTALL_DATA) $$f $(exampledir)/$$f; \
	190	+ $(INSTALL_DATA) $$f $(DESTDIR)$(exampledir)/$$f; \
	191	done
	192	- -test -d $(exampleimagedir) \|\| $(mkinstalldirs) $(exampleimagedir)
	193	- rm -f $(exampleimagedir)/$(HTMLEXAMPLEIMAGEFILES)
	194	- $(INSTALL_DATA) $(imagedir)/$(HTMLEXAMPLEIMAGEFILES) $(exampleimagedir)
b0092f3d	195	+ $(mkinstalldirs) $(DESTDIR)$(exampleimagedir)
f0cb3a2e JB	196	+ $(INSTALL_DATA) $(imagedir)/$(HTMLEXAMPLEIMAGEFILES) $(DESTDIR)$(exampleimagedir)
	197
	198	uninstall_sub:
b0092f3d JR	199	-for f in groff groff-*; do \
	200	diff -Nur groff-1.18.orig/src/preproc/eqn/Makefile.sub groff-1.18/src/preproc/eqn/Makefile.sub
	201	--- groff-1.18.orig/src/preproc/eqn/Makefile.sub Sun Jun 2 18:42:56 2002
	202	+++ groff-1.18/src/preproc/eqn/Makefile.sub Mon Jul 29 14:58:47 2002
	203	@@ -52,8 +52,7 @@
8cc6167a	204	chmod +x $@
f3ffa96d	205
	206	install_data: neqn
	207	- -rm -f $(bindir)/$(NAMEPREFIX)neqn
	208	- $(INSTALL_SCRIPT) neqn $(bindir)/$(NAMEPREFIX)neqn
	209	+ $(INSTALL_SCRIPT) neqn $(DESTDIR)$(bindir)/$(NAMEPREFIX)neqn
	210
	211	uninstall_sub:
8cc6167a	212	-rm -f $(bindir)/$(NAMEPREFIX)neqn
b0092f3d JR	213	diff -Nur groff-1.18.orig/src/roff/grog/Makefile.sub groff-1.18/src/roff/grog/Makefile.sub
	214	--- groff-1.18.orig/src/roff/grog/Makefile.sub Fri Jun 14 12:44:00 2002
	215	+++ groff-1.18/src/roff/grog/Makefile.sub Mon Jul 29 14:59:05 2002
f0cb3a2e	216	@@ -24,9 +24,8 @@
f3ffa96d	217	chmod +x $@
	218
	219	install_data: grog
	220	- -test -d $(bindir) \|\| $(mkinstalldirs) $(bindir)
	221	- -rm -f $(bindir)/grog
	222	- $(INSTALL_SCRIPT) grog $(bindir)/grog
	223	+ $(mkinstalldirs) $(DESTDIR)$(bindir)
	224	+ $(INSTALL_SCRIPT) grog $(DESTDIR)$(bindir)/grog
	225
	226	uninstall_sub:
8cc6167a	227	-rm -f $(bindir)/grog
b0092f3d JR	228	diff -Nur groff-1.18.orig/src/roff/nroff/Makefile.sub groff-1.18/src/roff/nroff/Makefile.sub
	229	--- groff-1.18.orig/src/roff/nroff/Makefile.sub Thu Nov 16 22:10:44 2000
	230	+++ groff-1.18/src/roff/nroff/Makefile.sub Mon Jul 29 14:59:55 2002
	231	@@ -12,9 +12,8 @@
9564659a	232	chmod +x $@
	233
	234	install_data: nroff
f3ffa96d	235	- -test -d $(bindir) \|\| $(mkinstalldirs) $(bindir)
9564659a	236	- -rm -f $(bindir)/$(NAMEPREFIX)nroff
f3ffa96d	237	- $(INSTALL_SCRIPT) nroff $(bindir)/$(NAMEPREFIX)nroff
	238	+ $(mkinstalldirs) $(DESTDIR)$(bindir)
	239	+ $(INSTALL_SCRIPT) nroff $(DESTDIR)$(bindir)/$(NAMEPREFIX)nroff
9564659a	240
9564659a	241	uninstall_sub:
8cc6167a	242	-rm -f $(bindir)/$(NAMEPREFIX)nroff
b0092f3d JR	243	diff -Nur groff-1.18.orig/src/utils/afmtodit/Makefile.sub groff-1.18/src/utils/afmtodit/Makefile.sub
	244	--- groff-1.18.orig/src/utils/afmtodit/Makefile.sub Thu Nov 16 22:10:46 2000
	245	+++ groff-1.18/src/utils/afmtodit/Makefile.sub Mon Jul 29 15:00:27 2002
	246	@@ -15,9 +15,8 @@
f3ffa96d	247	chmod +x afmtodit
	248
	249	install_data: afmtodit
	250	- -test -d $(bindir) \|\| $(mkinstalldirs) $(bindir)
	251	- -rm -f $(bindir)/afmtodit
	252	- $(INSTALL_SCRIPT) afmtodit $(bindir)/afmtodit
	253	+ $(mkinstalldirs) $(DESTDIR)$(bindir)
	254	+ $(INSTALL_SCRIPT) afmtodit $(DESTDIR)$(bindir)/afmtodit
	255
	256	uninstall_sub:
8cc6167a	257	-rm -f $(bindir)/afmtodit
b0092f3d JR	258	diff -Nur groff-1.18.orig/src/utils/indxbib/Makefile.sub groff-1.18/src/utils/indxbib/Makefile.sub
	259	--- groff-1.18.orig/src/utils/indxbib/Makefile.sub Fri May 3 00:33:22 2002
	260	+++ groff-1.18/src/utils/indxbib/Makefile.sub Mon Jul 29 15:01:35 2002
f0cb3a2e	261	@@ -12,18 +12,10 @@
f3ffa96d	262	NAMEPREFIX=$(g)
	263
	264	install_data: eign
	265	- -test -d $(datadir) \|\| $(mkinstalldirs) $(datadir)
8cc6167a	266	- -test -d $(dataprogramdir) \|\| $(mkinstalldirs) $(dataprogramdir)
f3ffa96d	267	- -test -d $(datasubdir) \|\| $(mkinstalldirs) $(datasubdir)
	268	- if test -f /usr/lib/eign; then \
	269	- rm -f $(common_words_file); \
	270	- ln -s /usr/lib/eign $(common_words_file) 2>/dev/null \
	271	- \|\| ln /usr/lib/eign $(common_words_file) 2>/dev/null \
	272	- \|\| cp /usr/lib/eign $(common_words_file); \
	273	- else \
	274	- rm -f $(common_words_file); \
	275	- $(INSTALL_DATA) $(srcdir)/eign $(common_words_file); \
	276	- fi
	277	+ $(mkinstalldirs) $(DESTDIR)$(datadir)
8cc6167a	278	+ $(mkinstalldirs) $(DESTDIR)$(dataprogramdir)
f3ffa96d	279	+ $(mkinstalldirs) $(DESTDIR)$(datasubdir)
	280	+ $(INSTALL_DATA) $(srcdir)/eign $(DESTDIR)$(common_words_file)
	281
	282	uninstall_sub:
8cc6167a	283	-rm -f $(common_words_file)
b0092f3d JR	284	diff -Nur groff-1.18.orig/tmac/Makefile.sub groff-1.18/tmac/Makefile.sub
	285	--- groff-1.18.orig/tmac/Makefile.sub Sat Jul 13 22:41:16 2002
	286	+++ groff-1.18/tmac/Makefile.sub Mon Jul 29 15:04:07 2002
	287	@@ -43,39 +43,30 @@
f3ffa96d	288
8cc6167a JB	289	install_data: $(NORMALFILES) $(SPECIALFILES) man.local \
8cc6167a JB	290	stamp-strip stamp-wrap stamp-sed
f3ffa96d	291	- -test -d $(tmacdir) \|\| $(mkinstalldirs) $(tmacdir)
8cc6167a JB	292	- -test -d $(systemtmacdir) \|\| $(mkinstalldirs) $(systemtmacdir)
8cc6167a JB	293	- -test -d $(localtmacdir) \|\| $(mkinstalldirs) $(localtmacdir)
f3ffa96d	294	+ $(mkinstalldirs) $(DESTDIR)$(tmacdir)
8cc6167a JB	295	+ $(mkinstalldirs) $(DESTDIR)$(systemtmacdir)
	296	+ $(mkinstalldirs) $(DESTDIR)$(localtmacdir)
	297	if test -n "$(tmac_wrap)"; then \
	298	for m in ""$(tmac_wrap); do \
	299	- $(INSTALL_DATA) $$m-wrap $(systemtmacdir)/$$m.tmac; \
	300	+ $(INSTALL_DATA) $$m-wrap $(DESTDIR)$(systemtmacdir)/$$m.tmac; \
	301	done; \
	302	fi
9564659a	303	for f in $(NORMALFILES); do \
	304	- rm -f $(tmacdir)/$$f; \
	305	- $(INSTALL_DATA) $(srcdir)/$$f $(tmacdir)/$$f; \
9564659a	306	+ $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(tmacdir)/$$f; \
9564659a	307	done
8cc6167a JB	308	- -rm -f $(tmacdir)/$(tmac_s_prefix)s.tmac
	309	- $(INSTALL_DATA) $(srcdir)/s.tmac $(tmacdir)/$(tmac_s_prefix)s.tmac
	310	- -rm -f $(tmacdir)/ms.tmac
	311	- $(INSTALL_DATA) ms.tmac-sed $(tmacdir)/ms.tmac
	312	- -rm -f $(tmacdir)/$(tmac_an_prefix)an.tmac
	313	- $(INSTALL_DATA) $(srcdir)/an.tmac $(tmacdir)/$(tmac_an_prefix)an.tmac
	314	- -rm -f $(tmacdir)/man.tmac
	315	- $(INSTALL_DATA) man.tmac-sed $(tmacdir)/man.tmac
	316	+ $(INSTALL_DATA) $(srcdir)/s.tmac $(DESTDIR)$(tmacdir)/$(tmac_s_prefix)s.tmac
	317	+ $(INSTALL_DATA) ms.tmac-sed $(DESTDIR)$(tmacdir)/ms.tmac
	318	+ $(INSTALL_DATA) $(srcdir)/an.tmac $(DESTDIR)$(tmacdir)/$(tmac_an_prefix)an.tmac
	319	+ $(INSTALL_DATA) man.tmac-sed $(DESTDIR)$(tmacdir)/man.tmac
9564659a	320	for f in $(STRIPFILES); do \
	321	- rm -f $(tmacdir)/$$f; \
	322	- $(INSTALL_DATA) $$f-s $(tmacdir)/$$f; \
9564659a	323	+ $(INSTALL_DATA) $$f-s $(DESTDIR)$(tmacdir)/$$f; \
9564659a	324	done
f3ffa96d	325	- -test -d $(mdocdir) \|\| $(mkinstalldirs) $(mdocdir)
8cc6167a	326	+ $(mkinstalldirs) $(DESTDIR)$(mdocdir)
9564659a	327	for f in $(MDOCFILES); do \
	328	- rm -f $(mdocdir)/$$f; \
	329	- $(INSTALL_DATA) $$f-s $(mdocdir)/$$f; \
9564659a	330	+ $(INSTALL_DATA) $$f-s $(DESTDIR)$(mdocdir)/$$f; \
9564659a	331	done
8cc6167a JB	332	- -test -f $(localtmacdir)/man.local \|\| \
	333	- $(INSTALL_DATA) $(srcdir)/man.local $(localtmacdir)/man.local
	334	- -test -f $(localtmacdir)/mdoc.local \|\| \
	335	- $(INSTALL_DATA) mdoc.local-s $(localtmacdir)/mdoc.local
	336	+ $(INSTALL_DATA) $(srcdir)/man.local $(DESTDIR)$(localtmacdir)/man.local
	337	+ $(INSTALL_DATA) mdoc.local-s $(DESTDIR)$(localtmacdir)/mdoc.local
9564659a	338
8cc6167a JB	339	stamp-strip: $(STRIPFILES) $(MDOCFILES) mdoc.local
8cc6167a JB	340	for f in $(STRIPFILES) $(MDOCFILES) mdoc.local; do \
b0092f3d JR	341	--- groff-1.18.orig/contrib/eqn2graph/Makefile.sub Mon Jul 8 00:14:56 2002
	342	+++ groff-1.18/contrib/eqn2graph/Makefile.sub Mon Jul 29 15:12:05 2002
	343	@@ -11,9 +11,8 @@
	344	chmod +x $@
	345
	346	install_data: eqn2graph
	347	- -test -d $(bindir) \|\| $(mkinstalldirs) $(bindir)
	348	- -rm -f $(bindir)/eqn2graph
	349	- $(INSTALL_SCRIPT) eqn2graph $(bindir)/eqn2graph
	350	+ $(mkinstalldirs) $(DESTDIR)$(bindir)
	351	+ $(INSTALL_SCRIPT) eqn2graph $(DESTDIR)$(bindir)/eqn2graph
	352
	353	uninstall_sub:
	354	-rm -f $(bindir)/eqn2graph
	355	--- groff-1.18.orig/contrib/mom/Makefile.sub Fri Jun 7 13:56:32 2002
	356	+++ groff-1.18/contrib/mom/Makefile.sub Mon Jul 29 15:13:36 2002
	357	@@ -90,24 +90,20 @@
	358
	359	install_data: $(NORMALFILES) $(HTMLDOCFILES) \
	360	$(EXAMPLEFILES) $(PROCESSEDEXAMPLEFILES)
	361	- -test -d $(tmacdir) \|\| $(mkinstalldirs) $(tmacdir)
	362	+ $(mkinstalldirs) $(DESTDIR)$(tmacdir)
	363	for f in $(NORMALFILES); do \
	364	- rm -f $(tmacdir)/$$f; \
	365	- $(INSTALL_DATA) $(srcdir)/$$f $(tmacdir)/$$f; \
	366	+ $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(tmacdir)/$$f; \
	367	done
	368	- -test -d $(htmldocdir)/momdoc \|\| $(mkinstalldirs) $(htmldocdir)/momdoc
	369	+ $(mkinstalldirs) $(DESTDIR)$(htmldocdir)/momdoc
	370	for f in $(HTMLDOCFILES); do \
	371	- rm -f $(htmldocdir)/$$f; \
	372	- $(INSTALL_DATA) $(srcdir)/$$f $(htmldocdir)/$$f; \
	373	+ $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(htmldocdir)/$$f; \
	374	done
	375	- -test -d $(exampledir) \|\| $(mkinstalldirs) $(exampledir)
	376	+ $(mkinstalldirs) $(DESTDIR)$(exampledir)
	377	for f in $(EXAMPLEFILES); do \
	378	- rm -f $(exampledir)/$$f; \
	379	- $(INSTALL_DATA) $(srcdir)/$$f $(docdir)/$$f; \
	380	+ $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(docdir)/$$f; \
	381	done
	382	for f in $(PROCESSEDEXAMPLEFILES); do \
	383	- rm -f $(exampledir)/$$f; \
	384	- $(INSTALL_DATA) $$f $(docdir)/$$f; \
	385	+ $(INSTALL_DATA) $$f $(DESTDIR)$(docdir)/$$f; \
	386	done
	387
	388	uninstall_sub:
	389	--- groff-1.18.orig/contrib/pic2graph/Makefile.sub Sat Aug 11 00:16:11 2001
	390	+++ groff-1.18/contrib/pic2graph/Makefile.sub Mon Jul 29 15:13:54 2002
	391	@@ -11,9 +11,8 @@
afd288b4 JB	392	chmod +x $@
afd288b4 JB	393
b0092f3d	394	install_data: pic2graph
afd288b4	395	- -test -d $(bindir) \|\| $(mkinstalldirs) $(bindir)
b0092f3d JR	396	- -rm -f $(bindir)/pic2graph
	397	- $(INSTALL_SCRIPT) pic2graph $(bindir)/pic2graph
	398	+ $(mkinstalldirs) $(DESTDIR)$(bindir)
	399	+ $(INSTALL_SCRIPT) pic2graph $(DESTDIR)$(bindir)/pic2graph
afd288b4 JB	400
afd288b4 JB	401	uninstall_sub:
b0092f3d	402	-rm -f $(bindir)/pic2graph