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