]>
Commit | Line | Data |
---|---|---|
875d1eff | 1 | diff -Nru wget-1.6/doc/Makefile.in wget-1.6.new/doc/Makefile.in |
2 | --- wget-1.6/doc/Makefile.in Tue Jan 2 02:20:58 2001 | |
3 | +++ wget-1.6.new/doc/Makefile.in Tue Jan 2 02:22:39 2001 | |
4 | @@ -90,45 +90,28 @@ | |
269fb7c8 AF |
5 | |
6 | # install info pages, creating install directory if necessary | |
7 | install.info: wget.info | |
8 | - $(top_srcdir)/mkinstalldirs $(infodir) | |
9 | + $(top_srcdir)/mkinstalldirs $(DESTDIR)$(infodir) | |
875d1eff | 10 | -for file in wget.info wget.info-*[0-9]; do \ |
11 | - test -f $$file && $(INSTALL_DATA) $$file $(infodir)/$$file ; \ | |
12 | + test -f $$file && $(INSTALL_DATA) $$file $(DESTDIR)$(infodir)/$$file ; \ | |
269fb7c8 AF |
13 | done |
14 | ||
15 | # install man page, creating install directory if necessary | |
16 | install.man: | |
17 | - $(top_srcdir)/mkinstalldirs $(mandir)/man$(manext) | |
18 | - $(INSTALL_DATA) $(srcdir)/$(MAN) $(mandir)/man$(manext)/$(MAN) | |
19 | + $(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man$(manext) | |
20 | + $(INSTALL_DATA) $(srcdir)/$(MAN) $(DESTDIR)$(mandir)/man$(manext)/$(MAN) | |
21 | ||
22 | # install sample.wgetrc | |
23 | install.wgetrc: | |
24 | - $(top_srcdir)/mkinstalldirs $(sysconfdir) | |
25 | - @if test -f $(WGETRC); then \ | |
26 | - if cmp -s $(srcdir)/sample.wgetrc $(WGETRC); then echo ""; \ | |
875d1eff | 27 | - else \ |
269fb7c8 AF |
28 | - echo ' $(INSTALL_DATA) $(srcdir)/sample.wgetrc $(WGETRC).new'; \ |
29 | - $(INSTALL_DATA) $(srcdir)/sample.wgetrc $(WGETRC).new; \ | |
875d1eff | 30 | - echo; \ |
31 | - echo "WARNING: Differing \`$(WGETRC)'"; \ | |
32 | - echo " exists and has been spared. You might want to"; \ | |
33 | - echo " consider merging in the new lines from"; \ | |
34 | - echo " \`$(WGETRC).new'."; \ | |
35 | - echo; \ | |
36 | - echo "<Hit RETURN to acknowledge>\c"; \ | |
37 | - read user_input; \ | |
38 | - echo; \ | |
39 | - fi; \ | |
40 | - else \ | |
269fb7c8 | 41 | - $(INSTALL_DATA) $(srcdir)/sample.wgetrc $(WGETRC); \ |
875d1eff | 42 | - fi |
43 | + $(top_srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir) | |
44 | + $(INSTALL_DATA) $(srcdir)/sample.wgetrc $(DESTDIR)$(WGETRC) | |
269fb7c8 AF |
45 | |
46 | # uninstall info pages | |
47 | uninstall.info: | |
48 | - $(RM) $(infodir)/wget.info* | |
49 | + $(RM) $(DESTDIR)$(infodir)/wget.info* | |
50 | ||
51 | # uninstall man page | |
52 | uninstall.man: | |
53 | - $(RM) $(mandir)/man$(manext)/$(MAN) | |
54 | + $(RM) $(DESTDIR)$(mandir)/man$(manext)/$(MAN) | |
55 | ||
269fb7c8 AF |
56 | # |
57 | # Dependencies for cleanup | |
875d1eff | 58 | diff -Nru wget-1.6/po/Makefile.in.in wget-1.6.new/po/Makefile.in.in |
59 | --- wget-1.6/po/Makefile.in.in Tue Jan 2 02:20:58 2001 | |
60 | +++ wget-1.6.new/po/Makefile.in.in Tue Jan 2 02:20:07 2001 | |
269fb7c8 AF |
61 | @@ -92,8 +92,8 @@ |
62 | for cat in $$catalogs; do \ | |
63 | cat=`basename $$cat`; \ | |
64 | case "$$cat" in \ | |
65 | - *.gmo) destdir=$(gnulocaledir);; \ | |
66 | - *) destdir=$(localedir);; \ | |
67 | + *.gmo) destdir=$(DESTDIR)$(gnulocaledir);; \ | |
68 | + *) destdir=$(DESTDIR)$(localedir);; \ | |
69 | esac; \ | |
70 | lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \ | |
71 | dir=$$destdir/$$lang/LC_MESSAGES; \ | |
875d1eff | 72 | diff -Nru wget-1.6/src/Makefile.in wget-1.6.new/src/Makefile.in |
73 | --- wget-1.6/src/Makefile.in Tue Jan 2 02:20:58 2001 | |
74 | +++ wget-1.6.new/src/Makefile.in Tue Jan 2 02:20:07 2001 | |
269fb7c8 AF |
75 | @@ -100,11 +100,11 @@ |
76 | uninstall: uninstall.bin | |
77 | ||
78 | install.bin: wget$(exeext) | |
79 | - $(top_srcdir)/mkinstalldirs $(bindir) | |
80 | - $(INSTALL_PROGRAM) wget$(exeext) $(bindir)/wget$(exeext) | |
81 | + $(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir) | |
82 | + $(INSTALL_PROGRAM) wget$(exeext) $(DESTDIR)$(bindir)/wget$(exeext) | |
83 | ||
84 | uninstall.bin: | |
85 | - $(RM) $(bindir)/wget$(exeext) | |
86 | + $(RM) $(DESTDIR)$(bindir)/wget$(exeext) | |
87 | ||
88 | # | |
89 | # Dependencies for cleanup |