1 diff -Nur groff-1.17.orig/Makefile.comm groff-1.17/Makefile.comm
2 --- groff-1.17.orig/Makefile.comm Wed Nov 8 17:17:34 2000
3 +++ groff-1.17/Makefile.comm Sun Jun 10 00:55:22 2001
8 - -test -d $(manroot) || $(mkinstalldirs) $(manroot)
9 - -test -d $(man1dir) || $(mkinstalldirs) $(man1dir)
10 + $(mkinstalldirs) $(DESTDIR)$(man1dir)
11 + $(mkinstalldirs) $(DESTDIR)$(man5dir)
12 + $(mkinstalldirs) $(DESTDIR)$(man7dir)
14 for p in $$pages; do \
15 prog=`basename $$p .n`; \
16 - target=$(man1dir)/$(NAMEPREFIX)$$prog.$(man1ext); \
18 + target=$(DESTDIR)$(man1dir)/$(NAMEPREFIX)$$prog.$(man1ext); \
19 echo $(INSTALL_DATA) $$p $$target; \
20 $(INSTALL_DATA) $$p $$target; \
22 - -test -d $(man5dir) || $(mkinstalldirs) $(man5dir)
24 for p in $$pages; do \
25 - target=$(man5dir)/`basename $$p .n`.$(man5ext); \
27 + target=$(DESTDIR)$(man5dir)/`basename $$p .n`.$(man5ext); \
28 echo $(INSTALL_DATA) $$p $$target; \
29 $(INSTALL_DATA) $$p $$target; \
31 - -test -d $(man7dir) || $(mkinstalldirs) $(man7dir)
33 for p in $$pages; do \
34 - target=$(man7dir)/`basename $$p .n`.$(man7ext); \
36 + target=$(DESTDIR)$(man7dir)/`basename $$p .n`.$(man7ext); \
37 echo $(INSTALL_DATA) $$p $$target; \
38 $(INSTALL_DATA) $$p $$target; \
44 - -test -d $(bindir) || $(mkinstalldirs) $(bindir)
45 - rm -f $(bindir)/$(NAMEPREFIX)$(PROG)
46 - $(INSTALL_PROGRAM) $(PROG) $(bindir)/$(NAMEPREFIX)$(PROG)
47 + $(mkinstalldirs) $(DESTDIR)$(bindir)
48 + $(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(bindir)/$(NAMEPREFIX)$(PROG)
50 .PHONY: uninstall_prog
56 - -test -d $(datadir) || $(mkinstalldirs) $(datadir)
57 - -test -d $(dataprogramdir) || $(mkinstalldirs) $(dataprogramdir)
58 - -test -d $(datasubdir) || $(mkinstalldirs) $(datasubdir)
59 - -test -d $(fontdir) || $(mkinstalldirs) $(fontdir)
60 - -test -d $(fontsubdir) || $(mkinstalldirs) $(fontsubdir)
61 - -if test -d $(srcdir)/generate; then \
62 - test -d $(fontsubdir)/generate || \
63 - $(mkinstalldirs) $(fontsubdir)/generate; \
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; \
76 - $(INSTALL_DATA) $(srcdir)/$$f $(fontsubdir)/$$f; \
77 + $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(fontsubdir)/$$f; \
81 diff -Nur groff-1.17.orig/Makefile.in groff-1.17/Makefile.in
82 --- groff-1.17.orig/Makefile.in Sat Apr 14 16:25:12 2001
83 +++ groff-1.17/Makefile.in Sun Jun 10 00:56:18 2001
86 man7dir=$(manroot)/man$(man7ext)
90 # DEFINES should include the following:
91 # -DHAVE_MMAP if you have mmap() and <sys/mman.h>
92 # -DARRAY_DELETE_NEEDS_SIZE if your C++ doesn't understand `delete []'
94 "man5dir=$(man5dir)" \
95 "man7ext=$(man7ext)" \
96 "man7dir=$(man7dir)" \
97 + "infodir=$(infodir)" \
98 "mkinstalldirs=$(mkinstalldirs)" \
99 "tmac_wrap=$(tmac_wrap)" \
100 "sys_tmac_prefix=$(sys_tmac_prefix)" \
101 diff -Nur groff-1.17.orig/contrib/mm/Makefile.sub groff-1.17/contrib/mm/Makefile.sub
102 --- groff-1.17.orig/contrib/mm/Makefile.sub Fri Nov 17 05:26:02 2000
103 +++ groff-1.17/contrib/mm/Makefile.sub Sun Jun 10 00:58:34 2001
107 install_mm: install_mmroff install_m
108 - -test -d $(tmacdir)/mm || $(mkinstalldirs) $(tmacdir)/mm
109 + $(mkinstalldirs) $(DESTDIR)$(tmacdir)/mm
110 -for f in $(FILES); do \
111 - rm -f $(tmacdir)/mm/$$f; \
112 - $(INSTALL_DATA) $(srcdir)/mm/$$f $(tmacdir)/mm/$$f; \
113 + $(INSTALL_DATA) $(srcdir)/mm/$$f $(DESTDIR)$(tmacdir)/mm/$$f; \
115 -for f in $(LOCALE); do \
116 - test -f $(tmacdir)/mm/$$f || touch $(tmacdir)/mm/$$f; \
117 + test -f $(DESTDIR)$(tmacdir)/mm/$$f || touch $(DESTDIR)$(tmacdir)/mm/$$f; \
121 - -test -d $(tmacdir) || $(mkinstalldirs) $(tmacdir)
122 - -rm -f $(tmacdir)/tmac.$(tmac_m_prefix)m
123 - -rm -f $(tmacdir)/$(tmac_m_prefix)m.tmac
124 - $(INSTALL_DATA) $(srcdir)/m.tmac $(tmacdir)/$(tmac_m_prefix)m.tmac
125 + $(mkinstalldirs) $(DESTDIR)$(tmacdir)
126 + $(INSTALL_DATA) $(srcdir)/m.tmac $(DESTDIR)$(tmacdir)/$(tmac_m_prefix)m.tmac
127 @sed -e "s;^.mso m.tmac;.mso $(tmac_m_prefix)m.tmac;g" \
128 - $(srcdir)/mse.tmac > $(tmacdir)/$(tmac_m_prefix)mse.tmac
129 + $(srcdir)/mse.tmac > $(DESTDIR)$(tmacdir)/$(tmac_m_prefix)mse.tmac
130 install_mmroff : mmroff
131 - -test -d $(bindir) || $(mkinstalldirs) $(bindir)
132 - -rm -f $(bindir)/mmroff
133 - $(INSTALL_SCRIPT) mmroff $(bindir)/mmroff
134 + $(mkinstalldirs) $(DESTDIR)$(bindir)
135 + $(INSTALL_SCRIPT) mmroff $(DESTDIR)$(bindir)/mmroff
139 diff -Nur groff-1.17.orig/doc/Makefile groff-1.17/doc/Makefile
140 --- groff-1.17.orig/doc/Makefile Wed Jan 17 15:17:18 2001
141 +++ groff-1.17/doc/Makefile Sun Jun 10 00:59:34 2001
144 makeinfo groff.texinfo
148 + install -d $(DESTDIR)$(infodir)
149 + install groff.info* $(DESTDIR)$(infodir)
152 -rm -f *.ps *.html *.ascii *.png *.gif *.dit core
153 diff -Nur groff-1.17.orig/src/preproc/eqn/Makefile.sub groff-1.17/src/preproc/eqn/Makefile.sub
154 --- groff-1.17.orig/src/preproc/eqn/Makefile.sub Wed Dec 13 17:13:06 2000
155 +++ groff-1.17/src/preproc/eqn/Makefile.sub Sun Jun 10 01:00:07 2001
160 - -rm -f $(bindir)/$(NAMEPREFIX)neqn
161 - $(INSTALL_SCRIPT) neqn $(bindir)/$(NAMEPREFIX)neqn
162 + $(INSTALL_SCRIPT) neqn $(DESTDIR)$(bindir)/$(NAMEPREFIX)neqn
165 -rm -f $(bindir)/$(NAMEPREFIX)neqn
166 diff -Nur groff-1.17.orig/src/roff/grog/Makefile.sub groff-1.17/src/roff/grog/Makefile.sub
167 --- groff-1.17.orig/src/roff/grog/Makefile.sub Wed Nov 15 23:29:52 2000
168 +++ groff-1.17/src/roff/grog/Makefile.sub Sun Jun 10 01:00:53 2001
173 - -test -d $(bindir) || $(mkinstalldirs) $(bindir)
174 - -rm -f $(bindir)/grog
175 - $(INSTALL_SCRIPT) grog $(bindir)/grog
176 + $(mkinstalldirs) $(DESTDIR)$(bindir)
177 + $(INSTALL_SCRIPT) grog $(DESTDIR)$(bindir)/grog
180 -rm -f $(bindir)/grog
181 diff -Nur groff-1.17.orig/src/roff/nroff/Makefile.sub groff-1.17/src/roff/nroff/Makefile.sub
182 --- groff-1.17.orig/src/roff/nroff/Makefile.sub Thu Nov 16 22:10:44 2000
183 +++ groff-1.17/src/roff/nroff/Makefile.sub Sun Jun 10 01:01:18 2001
188 - -test -d $(bindir) || $(mkinstalldirs) $(bindir)
189 - -rm -f $(bindir)/$(NAMEPREFIX)nroff
190 - $(INSTALL_SCRIPT) nroff $(bindir)/$(NAMEPREFIX)nroff
191 + $(mkinstalldirs) $(DESTDIR)$(bindir)
192 + $(INSTALL_SCRIPT) nroff $(DESTDIR)$(bindir)/$(NAMEPREFIX)nroff
195 -rm -f $(bindir)/$(NAMEPREFIX)nroff
196 diff -Nur groff-1.17.orig/src/utils/afmtodit/Makefile.sub groff-1.17/src/utils/afmtodit/Makefile.sub
197 --- groff-1.17.orig/src/utils/afmtodit/Makefile.sub Thu Nov 16 22:10:46 2000
198 +++ groff-1.17/src/utils/afmtodit/Makefile.sub Sun Jun 10 01:04:33 2001
202 install_data: afmtodit
203 - -test -d $(bindir) || $(mkinstalldirs) $(bindir)
204 - -rm -f $(bindir)/afmtodit
205 - $(INSTALL_SCRIPT) afmtodit $(bindir)/afmtodit
206 + $(mkinstalldirs) $(DESTDIR)$(bindir)
207 + $(INSTALL_SCRIPT) afmtodit $(DESTDIR)$(bindir)/afmtodit
210 -rm -f $(bindir)/afmtodit
211 diff -Nur groff-1.17.orig/src/utils/indxbib/Makefile.sub groff-1.17/src/utils/indxbib/Makefile.sub
212 --- groff-1.17.orig/src/utils/indxbib/Makefile.sub Mon Oct 23 08:19:14 2000
213 +++ groff-1.17/src/utils/indxbib/Makefile.sub Sun Jun 10 01:06:32 2001
218 - -test -d $(datadir) || $(mkinstalldirs) $(datadir)
219 - -test -d $(dataprogramdir) || $(mkinstalldirs) $(dataprogramdir)
220 - -test -d $(datasubdir) || $(mkinstalldirs) $(datasubdir)
221 - if test -f /usr/lib/eign; then \
222 - rm -f $(common_words_file); \
223 - ln -s /usr/lib/eign $(common_words_file) 2>/dev/null \
224 - || ln /usr/lib/eign $(common_words_file) 2>/dev/null \
225 - || cp /usr/lib/eign $(common_words_file); \
227 - rm -f $(common_words_file); \
228 - $(INSTALL_DATA) $(srcdir)/eign $(common_words_file); \
230 + $(mkinstalldirs) $(DESTDIR)$(datadir)
231 + $(mkinstalldirs) $(DESTDIR)$(dataprogramdir)
232 + $(mkinstalldirs) $(DESTDIR)$(datasubdir)
233 + $(INSTALL_DATA) $(srcdir)/eign $(DESTDIR)$(common_words_file)
236 -rm -f $(common_words_file)
237 diff -Nur groff-1.17.orig/tmac/Makefile.sub groff-1.17/tmac/Makefile.sub
238 --- groff-1.17.orig/tmac/Makefile.sub Tue Apr 17 13:16:11 2001
239 +++ groff-1.17/tmac/Makefile.sub Sun Jun 10 01:11:39 2001
242 install_data: $(NORMALFILES) $(SPECIALFILES) man.local \
243 stamp-strip stamp-wrap stamp-sed
244 - -test -d $(tmacdir) || $(mkinstalldirs) $(tmacdir)
245 - -test -d $(systemtmacdir) || $(mkinstalldirs) $(systemtmacdir)
246 - -test -d $(localtmacdir) || $(mkinstalldirs) $(localtmacdir)
247 + $(mkinstalldirs) $(DESTDIR)$(tmacdir)
248 + $(mkinstalldirs) $(DESTDIR)$(systemtmacdir)
249 + $(mkinstalldirs) $(DESTDIR)$(localtmacdir)
250 if test -n "$(tmac_wrap)"; then \
251 for m in ""$(tmac_wrap); do \
252 - $(INSTALL_DATA) $$m-wrap $(systemtmacdir)/$$m.tmac; \
253 + $(INSTALL_DATA) $$m-wrap $(DESTDIR)$(systemtmacdir)/$$m.tmac; \
256 for f in $(NORMALFILES); do \
257 - rm -f $(tmacdir)/$$f; \
258 - $(INSTALL_DATA) $(srcdir)/$$f $(tmacdir)/$$f; \
259 + $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(tmacdir)/$$f; \
261 - -rm -f $(tmacdir)/$(tmac_s_prefix)s.tmac
262 - $(INSTALL_DATA) $(srcdir)/s.tmac $(tmacdir)/$(tmac_s_prefix)s.tmac
263 - -rm -f $(tmacdir)/ms.tmac
264 - $(INSTALL_DATA) ms.tmac-sed $(tmacdir)/ms.tmac
265 - -rm -f $(tmacdir)/$(tmac_an_prefix)an.tmac
266 - $(INSTALL_DATA) $(srcdir)/an.tmac $(tmacdir)/$(tmac_an_prefix)an.tmac
267 - -rm -f $(tmacdir)/man.tmac
268 - $(INSTALL_DATA) man.tmac-sed $(tmacdir)/man.tmac
269 + $(INSTALL_DATA) $(srcdir)/s.tmac $(DESTDIR)$(tmacdir)/$(tmac_s_prefix)s.tmac
270 + $(INSTALL_DATA) ms.tmac-sed $(DESTDIR)$(tmacdir)/ms.tmac
271 + $(INSTALL_DATA) $(srcdir)/an.tmac $(DESTDIR)$(tmacdir)/$(tmac_an_prefix)an.tmac
272 + $(INSTALL_DATA) man.tmac-sed $(DESTDIR)$(tmacdir)/man.tmac
273 for f in $(STRIPFILES); do \
274 - rm -f $(tmacdir)/$$f; \
275 - $(INSTALL_DATA) $$f-s $(tmacdir)/$$f; \
276 + $(INSTALL_DATA) $$f-s $(DESTDIR)$(tmacdir)/$$f; \
278 - -test -d $(mdocdir) || $(mkinstalldirs) $(mdocdir)
279 + $(mkinstalldirs) $(DESTDIR)$(mdocdir)
280 for f in $(MDOCFILES); do \
281 - rm -f $(mdocdir)/$$f; \
282 - $(INSTALL_DATA) $$f-s $(mdocdir)/$$f; \
283 + $(INSTALL_DATA) $$f-s $(DESTDIR)$(mdocdir)/$$f; \
285 - -test -f $(localtmacdir)/man.local || \
286 - $(INSTALL_DATA) $(srcdir)/man.local $(localtmacdir)/man.local
287 - -test -f $(localtmacdir)/mdoc.local || \
288 - $(INSTALL_DATA) mdoc.local-s $(localtmacdir)/mdoc.local
289 + $(INSTALL_DATA) $(srcdir)/man.local $(DESTDIR)$(localtmacdir)/man.local
290 + $(INSTALL_DATA) mdoc.local-s $(DESTDIR)$(localtmacdir)/mdoc.local
292 stamp-strip: $(STRIPFILES) $(MDOCFILES) mdoc.local
293 for f in $(STRIPFILES) $(MDOCFILES) mdoc.local; do \