]>
Commit | Line | Data |
---|---|---|
d9251630 JR |
1 | diff -urN emirror-2.1.19/Makefile.in emirror-2.1.19.new/Makefile.in |
2 | --- emirror-2.1.19/Makefile.in Sun Jan 21 20:10:27 2001 | |
3 | +++ emirror-2.1.19.new/Makefile.in Thu Aug 16 21:21:05 2001 | |
4 | @@ -1,18 +1,19 @@ | |
5 | ||
6 | prefix=@prefix@ | |
7 | sysconfdir=@sysconfdir@ | |
8 | -bindir=$(prefix)/bin | |
9 | +bindir=$(DESTDIR)$(prefix)/bin | |
10 | INSTALL=@INSTALL@ | |
11 | PYTHON=@PYTHON@ | |
12 | -libdir=$(prefix)/lib/emirror | |
13 | -etcdir=$(sysconfdir)/emirror | |
14 | -mandir=$(prefix)/man/man1 | |
15 | +libdir=$(DESTDIR)$(prefix)/lib/emirror | |
16 | +etcdir=$(DESTDIR)$(sysconfdir)/emirror | |
17 | +mandir=$(DESTDIR)$(prefix)/share/man/man1 | |
18 | +htmldir=$(DESTDIR)@HTMLDIR@ | |
19 | ||
20 | all: | |
21 | @echo There\'s no need to compile anything - use \"make install\" | |
22 | ||
23 | install : | |
24 | - @echo Installing files in $(prefix) ... | |
25 | + @echo Installing files in $(DESTDIR)$(prefix) ... | |
26 | @$(INSTALL) -d $(bindir) | |
27 | @$(INSTALL) emirror $(bindir) | |
28 | @$(INSTALL) emirrortest $(bindir) | |
29 | @@ -29,7 +30,8 @@ | |
30 | @$(INSTALL) -b -m 644 etc/*.cfg $(etcdir) | |
31 | @$(INSTALL) -b -m 644 etc/email-addresses $(etcdir) | |
32 | @$(INSTALL) -m 644 etc/*.template $(etcdir) | |
33 | - @$(INSTALL) -m 644 etc/*.gif $(etcdir) | |
34 | + @$(INSTALL) -m 644 etc/*.gif $(htmldir) | |
35 | + @$(INSTALL) -m 644 etc/*.inc $(htmldir) | |
36 | @$(INSTALL) -d $(etcdir)/active | |
37 | @$(INSTALL) -d $(etcdir)/unused | |
38 | @$(INSTALL) -m 644 etc/unused/*.cfg $(etcdir)/unused | |
39 | diff -urN emirror-2.1.19/bin/mirror.in emirror-2.1.19.new/bin/mirror.in | |
40 | --- emirror-2.1.19/bin/mirror.in Sun Dec 3 10:59:25 2000 | |
41 | +++ emirror-2.1.19.new/bin/mirror.in Thu Aug 16 21:17:22 2001 | |
f9cb0ce3 JR |
42 | @@ -17,4 +17,4 @@ |
43 | ||
44 | # Start the mirror program and update the index page | |
45 | ||
d9251630 | 46 | -emirror -v -c @sysconfdir@/emirror/general.cfg -d @sysconfdir@/emirror/active/ -n @HTMLDIR@ |
f9cb0ce3 | 47 | +emirror -- -v -c @sysconfdir@/emirror/general.cfg -d @sysconfdir@/emirror/active/ |
d9251630 JR |
48 | diff -urN emirror-2.1.19/bin/updateindex.in emirror-2.1.19.new/bin/updateindex.in |
49 | --- emirror-2.1.19/bin/updateindex.in Sun Dec 3 11:34:33 2000 | |
50 | +++ emirror-2.1.19.new/bin/updateindex.in Thu Aug 16 21:17:33 2001 | |
f9cb0ce3 JR |
51 | @@ -10,4 +10,4 @@ |
52 | ||
53 | # Start the mirror program and update the index page | |
54 | ||
d9251630 | 55 | -emirror -v -c @sysconfdir@/emirror/general.cfg -n @HTMLDIR@ |
f9cb0ce3 | 56 | +emirror -- -v -c @sysconfdir@/emirror/general.cfg |
d9251630 JR |
57 | diff -urN emirror-2.1.19/etc/eclipt-index-php.template emirror-2.1.19.new/etc/eclipt-index-php.template |
58 | --- emirror-2.1.19/etc/eclipt-index-php.template Sun Apr 15 10:09:01 2001 | |
59 | +++ emirror-2.1.19.new/etc/eclipt-index-php.template Thu Aug 16 21:21:34 2001 | |
60 | @@ -1,4 +1,4 @@ | |
61 | -<? include "/home/htdocs/include/generic.inc"; ?> | |
62 | +<? include "generic.inc"; ?> | |
63 | <? HtmlHeader(""); ?> | |
64 | ||
65 | <spacer type="vertical" size=15> | |
66 | diff -urN emirror-2.1.19/etc/eclipt-logfile-php.template emirror-2.1.19.new/etc/eclipt-logfile-php.template | |
67 | --- emirror-2.1.19/etc/eclipt-logfile-php.template Sun Apr 15 10:10:19 2001 | |
68 | +++ emirror-2.1.19.new/etc/eclipt-logfile-php.template Thu Aug 16 21:21:18 2001 | |
69 | @@ -1,4 +1,4 @@ | |
70 | -<? include "/home/htdocs/include/generic.inc"; ?> | |
71 | +<? include "generic.inc"; ?> | |
72 | <? HtmlHeader(""); ?> | |
73 | ||
74 | <spacer type="vertical" size=15> | |
75 | diff -urN emirror-2.1.19/etc/eclipt-summary-php.template emirror-2.1.19.new/etc/eclipt-summary-php.template | |
76 | --- emirror-2.1.19/etc/eclipt-summary-php.template Sun Apr 15 10:10:48 2001 | |
77 | +++ emirror-2.1.19.new/etc/eclipt-summary-php.template Thu Aug 16 21:21:47 2001 | |
78 | @@ -1,4 +1,4 @@ | |
79 | -<? include "/home/htdocs/include/generic.inc"; ?> | |
80 | +<? include "generic.inc"; ?> | |
81 | <? HtmlHeader(""); ?> | |
82 | ||
83 | <spacer type="vertical" size=15> | |
84 | diff -urN emirror-2.1.19/etc/general.cfg.in emirror-2.1.19.new/etc/general.cfg.in | |
85 | --- emirror-2.1.19/etc/general.cfg.in Fri Apr 13 09:21:43 2001 | |
86 | +++ emirror-2.1.19.new/etc/general.cfg.in Thu Aug 16 21:18:59 2001 | |
f9cb0ce3 JR |
87 | @@ -1,18 +1,21 @@ |
88 | [general] | |
89 | +Download-url: ftp://localhost/pub/mirrors | |
90 | +Parent: /home/ftp/pub/mirrors | |
91 | Parent-Format: None | |
92 | Output-directory: @HTMLDIR@ | |
93 | Output-format: HTML | |
94 | Tries: 5 | |
95 | Wait: 30 | |
96 | -Email: root@localhost | |
97 | +Email: ftp@localhost | |
98 | Max-parallel: 3 | |
99 | Recursive: Yes | |
100 | +Follow-Symlinks: Yes | |
101 | Username: anonymous | |
102 | -Password: anonymous@localhost | |
d9251630 | 103 | -Error-MailCmd: mail -s "EMirror Error Report" Martin.Preishuber@eclipt.at |
f9cb0ce3 JR |
104 | +Password: emirror@localhost |
105 | +Error-MailCmd: mail -s "EMirror Error Report" ftp@localhost | |
106 | Mail-Users: @SYSCONFDIR@/emirror/email-addresses | |
107 | Mail-User-Cmd: mail -s "EMirror EMail-Information" | |
108 | Log-Template: @SYSCONFDIR@/emirror/logfile.template | |
109 | Index-Template: @SYSCONFDIR@/emirror/index.template | |
110 | Index-Directory: @HTMLDIR@ | |
d9251630 | 111 | -Summary-Template: @SYSCONFDIR@/emirror/summary.template |
f9cb0ce3 JR |
112 | \ No newline at end of file |
113 | +Summary-Template: @SYSCONFDIR@/emirror/summary.template | |
d9251630 JR |
114 | diff -urN emirror-2.1.19/man/emirror.1 emirror-2.1.19.new/man/emirror.1 |
115 | --- emirror-2.1.19/man/emirror.1 Fri Apr 13 10:28:46 2001 | |
116 | +++ emirror-2.1.19.new/man/emirror.1 Thu Aug 16 21:19:55 2001 | |
117 | @@ -120,7 +120,7 @@ | |
f9cb0ce3 JR |
118 | .IP "--mail-users" |
119 | Specifies a file, which contains a list of valid email-addresses | |
120 | of users, who want to get information about updates | |
121 | -(e.g. /usr/local/etc/email-addresses) | |
122 | +(e.g. /etc/emirror/email-addresses) | |
123 | .IP "--info-mailcmd" | |
124 | Command to send mail to users when one spcific mirror has been updated | |
125 | (e.g. mail -s "EMirror - Package updated: %s" user1@host1 user2@host2) | |
d9251630 | 126 | @@ -480,11 +480,11 @@ |
f9cb0ce3 JR |
127 | .IR EMIRRORCFGPATH |
128 | ||
129 | .SH FILES | |
130 | -\fI/usr/local/lib/emirror/*\fP, | |
131 | -\fI/usr/local/etc/general.cfg\fP, | |
132 | -\fI/usr/local/etc/email-addresses\fP, | |
133 | -\fI/usr/local/etc/active/*\fP, | |
134 | -\fI/usr/local/etc/unused/*\fP | |
135 | +\fI/usr/lib/emirror/*\fP, | |
136 | +\fI/etc/emirror/general.cfg\fP, | |
137 | +\fI/etc/emirror/email-addresses\fP, | |
138 | +\fI/etc/emirror/active/*\fP, | |
139 | +\fI/etc/emirror/unused/*\fP | |
140 | ||
141 | .SH UNRESTRICTIONS | |
142 | .PP |