1 diff -Nru groff-1.16.1/Makefile.comm groff-1.16.1.new/Makefile.comm
2 --- groff-1.16.1/Makefile.comm Thu Nov 30 03:24:08 2000
3 +++ groff-1.16.1.new/Makefile.comm Thu Nov 30 03:26:34 2000
5 all install install_bin install_data TAGS depend distfiles uninstall_sub:
7 install: prefix_must_exist install_bin install_data
10 uninstall: uninstall_sub
17 - -test -d $(manroot) || $(mkinstalldirs) $(manroot)
18 - -test -d $(man1dir) || $(mkinstalldirs) $(man1dir)
19 + $(mkinstalldirs) $(DESTDIR)$(man1dir)
20 + $(mkinstalldirs) $(DESTDIR)$(man5dir)
21 + $(mkinstalldirs) $(DESTDIR)$(man7dir)
23 for p in $$pages; do \
24 prog=`basename $$p .n`; \
25 - target=$(man1dir)/$(NAMEPREFIX)$$prog.$(man1ext); \
27 + target=$(DESTDIR)$(man1dir)/$(NAMEPREFIX)$$prog.$(man1ext); \
28 echo $(INSTALL_DATA) $$p $$target; \
29 $(INSTALL_DATA) $$p $$target; \
31 - -test -d $(man5dir) || $(mkinstalldirs) $(man5dir)
33 for p in $$pages; do \
34 - target=$(man5dir)/`basename $$p .n`.$(man5ext); \
36 + target=$(DESTDIR)$(man5dir)/`basename $$p .n`.$(man5ext); \
37 echo $(INSTALL_DATA) $$p $$target; \
38 $(INSTALL_DATA) $$p $$target; \
40 - -test -d $(man7dir) || $(mkinstalldirs) $(man7dir)
42 for p in $$pages; do \
43 - target=$(man7dir)/`basename $$p .n`.$(man7ext); \
45 + target=$(DESTDIR)$(man7dir)/`basename $$p .n`.$(man7ext); \
46 echo $(INSTALL_DATA) $$p $$target; \
47 $(INSTALL_DATA) $$p $$target; \
52 for p in $$pages; do \
53 - target=$(man1dir)/$(NAMEPREFIX)`basename $$p .n`.$(man1ext); \
54 + target=$(DESTDIR)$(man1dir)/$(NAMEPREFIX)`basename $$p .n`.$(man1ext); \
55 echo rm -f $$target; \
59 for p in $$pages; do \
60 - target=$(man5dir)/`basename $$p .n`.$(man5ext); \
61 + target=$(DESTDIR)$(man5dir)/`basename $$p .n`.$(man5ext); \
62 echo rm -f $$target; \
66 for p in $$pages; do \
67 - target=$(man7dir)/`basename $$p .n`.$(man7ext); \
68 + target=$(DESTDIR)$(man7dir)/`basename $$p .n`.$(man7ext); \
69 echo rm -f $$target; \
75 - -test -d $(bindir) || $(mkinstalldirs) $(bindir)
76 - rm -f $(bindir)/$(NAMEPREFIX)$(PROG)
77 - $(INSTALL_PROGRAM) $(PROG) $(bindir)/$(NAMEPREFIX)$(PROG)
78 + $(mkinstalldirs) $(DESTDIR)$(bindir)
79 + $(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(bindir)/$(NAMEPREFIX)$(PROG)
81 .PHONY: uninstall_prog
83 - -rm -f $(bindir)/$(NAMEPREFIX)$(PROG)
84 + -rm -f $(DESTDIR)$(bindir)/$(NAMEPREFIX)$(PROG)
88 - -test -d $(datadir) || $(mkinstalldirs) $(datadir)
89 - -test -d $(datasubdir) || $(mkinstalldirs) $(datasubdir)
90 - -test -d $(fontdir) || $(mkinstalldirs) $(fontdir)
91 - -test -d $(fontsubdir) || $(mkinstalldirs) $(fontsubdir)
92 - -if test -d $(srcdir)/generate; then \
93 - test -d $(fontsubdir)/generate || \
94 - $(mkinstalldirs) $(fontsubdir)/generate; \
96 - -for f in $(DEVFILES); do \
97 - rm -f $(fontsubdir)/$$f; \
98 + $(mkinstalldirs) $(DESTDIR)$(datadir)
99 + $(mkinstalldirs) $(DESTDIR)$(datasubdir)
100 + $(mkinstalldirs) $(DESTDIR)$(fontdir)
101 + $(mkinstalldirs) $(DESTDIR)$(fontsubdir)/generate
102 + for f in $(DEVFILES); do \
103 + rm -f $(DESTDIR)$(fontsubdir)/$$f; \
104 if test -f $$f; then \
105 - $(INSTALL_DATA) $$f $(fontsubdir)/$$f; \
106 + $(INSTALL_DATA) $$f $(DESTDIR)$(fontsubdir)/$$f; \
108 - $(INSTALL_DATA) $(srcdir)/$$f $(fontsubdir)/$$f; \
109 + $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(fontsubdir)/$$f; \
113 .PHONY: uninstall_dev
115 - -for f in $(DEVFILES); do rm -f $(fontsubdir)/$$f; done
116 + -for f in $(DEVFILES); do rm -f $(DESTDIR)$(fontsubdir)/$$f; done
117 -if test -d $(fontsubdir)/generate; then \
118 - rmdir $(fontsubdir)/generate; \
119 + rmdir $(DESTDIR)$(fontsubdir)/generate; \
121 - -rmdir $(fontsubdir)
122 + -rmdir $(DESTDIR)$(fontsubdir)
125 depend_src: depend.temp
126 diff -Nru groff-1.16.1/contrib/mm/Makefile.sub groff-1.16.1.new/contrib/mm/Makefile.sub
127 --- groff-1.16.1/contrib/mm/Makefile.sub Thu Nov 30 03:24:08 2000
128 +++ groff-1.16.1.new/contrib/mm/Makefile.sub Thu Nov 30 03:23:34 2000
132 install_mm: install_mmroff install_m
133 - -test -d $(tmacdir)/mm || $(mkinstalldirs) $(tmacdir)/mm
134 + $(mkinstalldirs) $(DESTDIR)$(tmacdir)/mm
135 -for f in $(FILES); do \
136 - rm -f $(tmacdir)/mm/$$f; \
137 - $(INSTALL_DATA) $(srcdir)/mm/$$f $(tmacdir)/mm/$$f; \
138 + $(INSTALL_DATA) $(srcdir)/mm/$$f $(DESTDIR)$(tmacdir)/mm/$$f; \
140 -for f in $(LOCALE); do \
141 - test -f $(tmacdir)/mm/$$f || touch $(tmacdir)/mm/$$f; \
142 + test -f $(tmacdir)/mm/$$f || touch $(DESTDIR)$(tmacdir)/mm/$$f; \
146 - -test -d $(tmacdir) || $(mkinstalldirs) $(tmacdir)
147 - -rm -f $(tmacdir)/tmac.$(tmac_m_prefix)m
148 - $(INSTALL_DATA) $(srcdir)/tmac.m $(tmacdir)/tmac.$(tmac_m_prefix)m
149 + $(mkinstalldirs) $(DESTDIR)$(tmacdir)
150 + $(INSTALL_DATA) $(srcdir)/tmac.m $(DESTDIR)$(tmacdir)/tmac.$(tmac_m_prefix)m
151 @sed -e "s;^.mso tmac.m;.mso tmac.$(tmac_m_prefix)m;g" \
152 - $(srcdir)/tmac.mse > $(tmacdir)/tmac.$(tmac_m_prefix)mse
153 + $(srcdir)/tmac.mse > $(DESTDIR)$(tmacdir)/tmac.$(tmac_m_prefix)mse
154 install_mmroff : mmroff
155 - -test -d $(bindir) || $(mkinstalldirs) $(bindir)
156 - -rm -f $(bindir)/mmroff
157 - $(INSTALL_SCRIPT) mmroff $(bindir)/mmroff
158 + $(mkinstalldirs) $(DESTDIR)$(bindir)
159 + $(INSTALL_SCRIPT) mmroff $(DESTDIR)$(bindir)/mmroff
167 - -for f in $(FILES); do rm -f $(tmacdir)/mm/$$f; done
168 + -for f in $(FILES); do rm -f $(DESTDIR)$(tmacdir)/mm/$$f; done
169 -for f in $(LOCALE); do \
170 - test -s $(tmacdir)/mm/$$f || rm -f $(tmacdir)/mm/$$f; \
171 + test -s $(DESTDIR)$(tmacdir)/mm/$$f || rm -f $(DESTDIR)$(tmacdir)/mm/$$f; \
173 - -rm -f $(tmacdir)/tmac.$(tmac_m_prefix)m
174 - -rm -f $(tmacdir)/tmac.$(tmac_m_prefix)mse
175 - -rmdir $(tmacdir)/mm
176 - -rm -f $(bindir)/mmroff
177 + -rm -f $(DESTDIR)$(tmacdir)/tmac.$(tmac_m_prefix)m
178 + -rm -f $(DESTDIR)$(tmacdir)/tmac.$(tmac_m_prefix)mse
179 + -rmdir $(DESTDIR)$(tmacdir)/mm
180 + -rm -f $(DESTDIR)$(bindir)/mmroff
181 diff -Nru groff-1.16.1/doc/Makefile groff-1.16.1.new/doc/Makefile
182 --- groff-1.16.1/doc/Makefile Thu Nov 30 03:24:09 2000
183 +++ groff-1.16.1.new/doc/Makefile Thu Nov 30 03:23:34 2000
186 makeinfo groff.texinfo
190 + $(mkinstalldirs) $(DESTDIR)$(infordir)
191 + $(INSTALL_DATA) *info* $(DESTDIR)$(infordir)
194 -rm -f *.ps *.html *.ascii *.png *.gif *.dit core
195 diff -Nru groff-1.16.1/src/preproc/eqn/Makefile.sub groff-1.16.1.new/src/preproc/eqn/Makefile.sub
196 --- groff-1.16.1/src/preproc/eqn/Makefile.sub Thu Nov 30 03:24:08 2000
197 +++ groff-1.16.1.new/src/preproc/eqn/Makefile.sub Thu Nov 30 03:23:34 2000
202 - -rm -f $(bindir)/$(NAMEPREFIX)neqn
203 - $(INSTALL_SCRIPT) neqn $(bindir)/$(NAMEPREFIX)neqn
204 + $(INSTALL_SCRIPT) neqn $(DESTDIR)$(bindir)/$(NAMEPREFIX)neqn
207 - -rm -f $(bindir)/$(NAMEPREFIX)neqn
208 + -rm -f $(DESTDIR)$(bindir)/$(NAMEPREFIX)neqn
209 diff -Nru groff-1.16.1/src/roff/grog/Makefile.sub groff-1.16.1.new/src/roff/grog/Makefile.sub
210 --- groff-1.16.1/src/roff/grog/Makefile.sub Thu Nov 30 03:24:08 2000
211 +++ groff-1.16.1.new/src/roff/grog/Makefile.sub Thu Nov 30 03:23:34 2000
216 - -test -d $(bindir) || $(mkinstalldirs) $(bindir)
217 - -rm -f $(bindir)/grog
218 - $(INSTALL_SCRIPT) grog $(bindir)/grog
219 + $(mkinstalldirs) $(DESTDIR)$(bindir)
220 + $(INSTALL_SCRIPT) grog $(DESTDIR)$(bindir)/grog
223 - -rm -f $(bindir)/grog
224 + -rm -f $(DESTDIR)$(bindir)/grog
225 diff -Nru groff-1.16.1/src/roff/nroff/Makefile.sub groff-1.16.1.new/src/roff/nroff/Makefile.sub
226 --- groff-1.16.1/src/roff/nroff/Makefile.sub Thu Nov 30 03:24:08 2000
227 +++ groff-1.16.1.new/src/roff/nroff/Makefile.sub Thu Nov 30 03:23:34 2000
232 - -test -d $(bindir) || $(mkinstalldirs) $(bindir)
233 - -rm -f $(bindir)/$(NAMEPREFIX)nroff
234 - $(INSTALL_SCRIPT) nroff $(bindir)/$(NAMEPREFIX)nroff
235 + $(mkinstalldirs) $(DESTDIR)$(bindir)
236 + $(INSTALL_SCRIPT) nroff $(DESTDIR)$(bindir)/$(NAMEPREFIX)nroff
239 - -rm -f $(bindir)/$(NAMEPREFIX)nroff
240 + -rm -f $(DESTDIR)$(bindir)/$(NAMEPREFIX)nroff
241 diff -Nru groff-1.16.1/src/roff/troff/Makefile.sub groff-1.16.1.new/src/roff/troff/Makefile.sub
242 --- groff-1.16.1/src/roff/troff/Makefile.sub Thu Nov 30 03:24:08 2000
243 +++ groff-1.16.1.new/src/roff/troff/Makefile.sub Thu Nov 30 03:23:34 2000
245 @echo const char \*revision = \"`cat $(top_srcdir)/REVISION`\"\; >>$@
247 install_data: hyphen.us
248 - -test -d $(datadir) || $(mkinstalldirs) $(datadir)
249 - -test -d $(datasubdir) || $(mkinstalldirs) $(datasubdir)
250 - -test -d $(tmacdir) || $(mkinstalldirs) $(tmacdir)
251 - -rm -f $(tmacdir)/hyphen.us
252 - $(INSTALL_DATA) $(srcdir)/hyphen.us $(tmacdir)/hyphen.us
253 + $(mkinstalldirs) $(DESTDIR)$(tmacdir)
254 + $(INSTALL_DATA) $(srcdir)/hyphen.us $(DESTDIR)$(tmacdir)/hyphen.us
257 - -rm -f $(tmacdir)/hyphen.us
258 + -rm -f $(DESTDIR)$(tmacdir)/hyphen.us
259 diff -Nru groff-1.16.1/src/utils/afmtodit/Makefile.sub groff-1.16.1.new/src/utils/afmtodit/Makefile.sub
260 --- groff-1.16.1/src/utils/afmtodit/Makefile.sub Thu Nov 30 03:24:08 2000
261 +++ groff-1.16.1.new/src/utils/afmtodit/Makefile.sub Thu Nov 30 03:23:34 2000
265 install_data: afmtodit
266 - -test -d $(bindir) || $(mkinstalldirs) $(bindir)
267 - -rm -f $(bindir)/afmtodit
268 - $(INSTALL_SCRIPT) afmtodit $(bindir)/afmtodit
269 + $(mkinstalldirs) $(DESTDIR)$(bindir)
270 + $(INSTALL_SCRIPT) afmtodit $(DESTDIR)$(bindir)/afmtodit
273 - -rm -f $(bindir)/afmtodit
274 + -rm -f $(DESTDIR)$(bindir)/afmtodit
275 diff -Nru groff-1.16.1/src/utils/indxbib/Makefile.sub groff-1.16.1.new/src/utils/indxbib/Makefile.sub
276 --- groff-1.16.1/src/utils/indxbib/Makefile.sub Thu Nov 30 03:24:09 2000
277 +++ groff-1.16.1.new/src/utils/indxbib/Makefile.sub Thu Nov 30 03:23:34 2000
282 - -test -d $(datadir) || $(mkinstalldirs) $(datadir)
283 - -test -d $(datasubdir) || $(mkinstalldirs) $(datasubdir)
284 - if test -f /usr/lib/eign; then \
285 - rm -f $(common_words_file); \
286 - ln -s /usr/lib/eign $(common_words_file) 2>/dev/null \
287 - || ln /usr/lib/eign $(common_words_file) 2>/dev/null \
288 - || cp /usr/lib/eign $(common_words_file); \
290 - rm -f $(common_words_file); \
291 - $(INSTALL_DATA) $(srcdir)/eign $(common_words_file); \
293 + $(mkinstalldirs) $(DESTDIR)$(datadir)
294 + $(mkinstalldirs) $(DESTDIR)$(datasubdir)
295 + $(INSTALL_DATA) $(srcdir)/eign $(DESTDIR)$(common_words_file)
298 - -rm -f $(common_words_file)
299 + -rm -f $(DESTDIR)$(common_words_file)
300 diff -Nru groff-1.16.1/tmac/Makefile.sub groff-1.16.1.new/tmac/Makefile.sub
301 --- groff-1.16.1/tmac/Makefile.sub Thu Nov 30 03:24:09 2000
302 +++ groff-1.16.1.new/tmac/Makefile.sub Thu Nov 30 03:23:34 2000
305 install_data: $(NORMALFILES) $(SPECIALFILES) \
306 stamp-wrap stamp-strip stamp-sed man.local
307 - -test -d $(tmacdir) || $(mkinstalldirs) $(tmacdir)
308 - if test -n "$(tmac_wrap)"; then \
309 - for m in ""$(tmac_wrap); do \
310 - $(INSTALL_DATA) $$m-wrap $(tmacdir)/tmac.$$m; \
313 + $(mkinstalldirs) $(DESTDIR)$(tmacdir)
314 + $(mkinstalldirs) $(DESTDIR)$(mdocdir)
315 + for m in ""$(tmac_wrap); do \
316 + $(INSTALL_DATA) $$m-wrap $(DESTDIR)$(tmacdir)/tmac.$$m; \
318 for f in $(NORMALFILES); do \
319 - rm -f $(tmacdir)/$$f; \
320 - $(INSTALL_DATA) $(srcdir)/$$f $(tmacdir)/$$f; \
321 + $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(tmacdir)/$$f; \
323 - -rm -f $(tmacdir)/tmac.$(tmac_s_prefix)s
324 - $(INSTALL_DATA) $(srcdir)/tmac.s $(tmacdir)/tmac.$(tmac_s_prefix)s
325 - -rm -f $(tmacdir)/tmac.ms
326 - $(INSTALL_DATA) tmac.ms-sed $(tmacdir)/tmac.ms
327 - -rm -f $(tmacdir)/tmac.$(tmac_an_prefix)an
328 - $(INSTALL_DATA) $(srcdir)/tmac.an $(tmacdir)/tmac.$(tmac_an_prefix)an
329 - -rm -f $(tmacdir)/tmac.man
330 - $(INSTALL_DATA) tmac.man-sed $(tmacdir)/tmac.man
331 + $(INSTALL_DATA) $(srcdir)/tmac.s $(DESTDIR)$(tmacdir)/tmac.$(tmac_s_prefix)s
332 + $(INSTALL_DATA) tmac.ms-sed $(DESTDIR)$(tmacdir)/tmac.ms
333 + $(INSTALL_DATA) $(srcdir)/tmac.an $(DESTDIR)$(tmacdir)/tmac.$(tmac_an_prefix)an
334 + $(INSTALL_DATA) tmac.man-sed $(DESTDIR)$(tmacdir)/tmac.man
335 for f in $(STRIPFILES); do \
336 - rm -f $(tmacdir)/$$f; \
337 - $(INSTALL_DATA) $$f-s $(tmacdir)/$$f; \
338 + $(INSTALL_DATA) $$f-s $(DESTDIR)$(tmacdir)/$$f; \
340 - -test -d $(mdocdir) || $(mkinstalldirs) $(mdocdir)
341 for f in $(MDOCFILES); do \
342 - rm -f $(mdocdir)/$$f; \
343 - $(INSTALL_DATA) $$f-s $(mdocdir)/$$f; \
344 + $(INSTALL_DATA) $$f-s $(DESTDIR)$(mdocdir)/$$f; \
346 - -test -f $(tmacdir)/man.local || \
347 - $(INSTALL_DATA) $(srcdir)/man.local $(tmacdir)/man.local
349 + $(INSTALL_DATA) $(srcdir)/man.local $(DESTDIR)$(tmacdir)/man.local
351 stamp-strip: $(STRIPFILES) $(MDOCFILES)
352 for f in $(STRIPFILES) $(MDOCFILES); do \
357 - -if test -n "$(tmac_wrap)"; then \
358 + -if test -n "$(DESTDIR)$(tmac_wrap)"; then \
359 for m in ""$(tmac_wrap); do \
360 - rm -f $(tmacdir)/tmac.$$m; \
361 + rm -f $(DESTDIR)$(tmacdir)/tmac.$$m; \
364 - -for f in $(NORMALFILES) $(STRIPFILES); do rm -f $(tmacdir)/$$f; done
365 - -rm -f $(tmacdir)/tmac.$(tmac_s_prefix)s
366 - -rm -f $(tmacdir)/tmac.$(tmac_an_prefix)an
367 - -rm -f $(tmacdir)/tmac.man $(tmacdir)/tmac.ms
368 - -if cmp -s $(tmacdir)/man.local $(srcdir)/man.local; then \
369 - rm -f $(tmacdir)/man.local; \
370 + -for f in $(NORMALFILES) $(STRIPFILES); do rm -f $(DESTDIR)$(tmacdir)/$$f; done
371 + -rm -f $(DESTDIR)$(tmacdir)/tmac.$(tmac_s_prefix)s
372 + -rm -f $(DESTDIR)$(tmacdir)/tmac.$(tmac_an_prefix)an
373 + -rm -f $(DESTDIR)$(tmacdir)/tmac.man $(tmacdir)/tmac.ms
374 + -if cmp -s $(DESTDIR)$(tmacdir)/man.local $(srcdir)/man.local; then \
375 + rm -f $(DESTDIR)$(tmacdir)/man.local; \
377 - -for f in $(MDOCFILES); do rm -f $(mdocdir)/$$f; done
379 + -for f in $(MDOCFILES); do rm -f $(DESTDIR)$(mdocdir)/$$f; done
380 + -rmdir $(DESTDIR)$(mdocdir)