]>
Commit | Line | Data |
---|---|---|
31231d13 | 1 | diff -urN asterisk-0.4.0-orig/Makefile asterisk-0.4.0/Makefile |
2 | --- asterisk-0.4.0-orig/Makefile Fri May 9 15:52:13 2003 | |
3 | +++ asterisk-0.4.0/Makefile Fri May 9 15:52:30 2003 | |
4 | @@ -152,10 +152,10 @@ | |
5 | make -C db1-ast clean | |
6 | ||
7 | datafiles: all | |
8 | - mkdir -p $(ASTVARLIBDIR)/sounds/digits | |
9 | + mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits | |
10 | for x in sounds/digits/*.gsm; do \ | |
11 | if grep -q "^%`basename $$x`%" sounds.txt; then \ | |
12 | - install $$x $(ASTVARLIBDIR)/sounds/digits ; \ | |
13 | + install $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits ; \ | |
14 | else \ | |
15 | echo "No description for $$x"; \ | |
16 | exit 1; \ | |
17 | @@ -163,16 +163,16 @@ | |
18 | done | |
19 | for x in sounds/vm-* sounds/transfer* sounds/pbx-* sounds/ss-* sounds/beep* sounds/dir-* sounds/conf-* sounds/agent-* sounds/invalid* sounds/tt-* sounds/auth-* sounds/privacy-*; do \ | |
20 | if grep -q "^%`basename $$x`%" sounds.txt; then \ | |
21 | - install $$x $(ASTVARLIBDIR)/sounds ; \ | |
22 | + install $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \ | |
23 | else \ | |
24 | echo "No description for $$x"; \ | |
25 | exit 1; \ | |
26 | fi; \ | |
27 | done | |
28 | - mkdir -p $(ASTVARLIBDIR)/mohmp3 | |
29 | - mkdir -p $(ASTVARLIBDIR)/images | |
30 | + mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 | |
31 | + mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/images | |
32 | for x in images/*.jpg; do \ | |
33 | - install $$x $(ASTVARLIBDIR)/images ; \ | |
34 | + install $$x $(DESTDIR)$(ASTVARLIBDIR)/images ; \ | |
35 | done | |
36 | mkdir -p $(AGI_DIR) | |
37 | ||
38 | @@ -186,27 +186,27 @@ | |
39 | fi | |
40 | ||
41 | bininstall: all | |
42 | - mkdir -p $(MODULES_DIR) | |
43 | - mkdir -p $(ASTSBINDIR) | |
44 | - mkdir -p $(ASTETCDIR) | |
45 | - mkdir -p $(ASTBINDIR) | |
46 | - mkdir -p $(ASTSBINDIR) | |
47 | - mkdir -p $(ASTVARRUNDIR) | |
48 | - install -m 755 asterisk $(ASTSBINDIR)/ | |
49 | - install -m 755 astgenkey $(ASTSBINDIR)/ | |
50 | - install -m 755 safe_asterisk $(ASTSBINDIR)/ | |
51 | + mkdir -p $(DESTDIR)$(MODULES_DIR) | |
52 | + mkdir -p $(DESTDIR)$(ASTSBINDIR) | |
53 | + mkdir -p $(DESTDIR)$(ASTETCDIR) | |
54 | + mkdir -p $(DESTDIR)$(ASTBINDIR) | |
55 | + mkdir -p $(DESTDIR)$(ASTSBINDIR) | |
56 | + mkdir -p $(DESTDIR)$(ASTVARRUNDIR) | |
57 | + install -m 755 asterisk $(DESTDIR)$(ASTSBINDIR)/ | |
58 | + install -m 755 astgenkey $(DESTDIR)$(ASTSBINDIR)/ | |
59 | + install -m 755 safe_asterisk $(DESTDIR)$(ASTSBINDIR)/ | |
60 | for x in $(SUBDIRS); do $(MAKE) -C $$x install || exit 1 ; done | |
61 | - install -d $(ASTHEADERDIR) | |
62 | - install include/asterisk/*.h $(ASTHEADERDIR) | |
63 | - rm -f $(ASTVARLIBDIR)/sounds/vm | |
64 | - mkdir -p $(ASTSPOOLDIR)/vm | |
65 | - rm -f $(ASTMODULESDIR)/chan_ixj.so | |
66 | - rm -f $(ASTMODULESDIR)/chan_tor.so | |
67 | - mkdir -p $(ASTVARLIBDIR)/sounds | |
68 | - mkdir -p $(ASTLOGDIR)/cdr-csv | |
69 | - mkdir -p $(ASTVARLIBDIR)/keys | |
70 | - install -m 644 keys/iaxtel.pub $(ASTVARLIBDIR)/keys | |
71 | - ( cd $(ASTVARLIBDIR)/sounds ; ln -s $(ASTSPOOLDIR)/vm . ) | |
72 | + install -d $(DESTDIR)$(ASTHEADERDIR) | |
73 | + install include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR) | |
74 | + rm -f $(DESTDIR)$(ASTVARLIBDIR)/sounds/vm | |
75 | + mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/vm | |
76 | + rm -f $(DESTDIR)$(ASTMODULESDIR)/chan_ixj.so | |
77 | + rm -f $(DESTDIR)$(ASTMODULESDIR)/chan_tor.so | |
78 | + mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds | |
79 | + mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-csv | |
80 | + mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/keys | |
81 | + install -m 644 keys/iaxtel.pub $(DESTDIR)$(ASTVARLIBDIR)/keys | |
82 | + ( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds ; ln -s $(DESTDIR)$(ASTSPOOLDIR)/vm . ) | |
83 | @echo " +---- Asterisk Installation Complete -------+" | |
84 | @echo " + +" | |
85 | @echo " + YOU MUST READ THE SECURITY DOCUMENT +" | |
86 | @@ -234,58 +234,58 @@ | |
87 | upgrade: all bininstall | |
88 | ||
89 | adsi: all | |
90 | - mkdir -p $(ASTETCDIR) | |
91 | + mkdir -p $(DESTDIR)$(ASTETCDIR) | |
92 | for x in configs/*.adsi; do \ | |
93 | - if ! [ -f $(ASTETCDIRX)/$$x ]; then \ | |
94 | - install -m 644 $$x $(ASTETCDIR)/`basename $$x` ; \ | |
95 | + if ! [ -f $(DESTDIR)$(ASTETCDIRX)/$$x ]; then \ | |
96 | + install -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x` ; \ | |
97 | fi ; \ | |
98 | done | |
99 | ||
100 | samples: all datafiles adsi | |
101 | - mkdir -p $(ASTETCDIR) | |
102 | + mkdir -p $(DESTDIR)$(ASTETCDIR) | |
103 | for x in configs/*.sample; do \ | |
104 | - if [ -f $(ASTETCDIR)/`basename $$x .sample` ]; then \ | |
105 | - mv -f $(ASTETCDIR)/`basename $$x .sample` $(ASTETCDIR)/`basename $$x .sample`.old ; \ | |
106 | + if [ -f $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` ]; then \ | |
107 | + mv -f $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample`.old ; \ | |
108 | fi ; \ | |
109 | - install $$x $(ASTETCDIR)/`basename $$x .sample` ;\ | |
110 | + install $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` ;\ | |
111 | done | |
112 | - echo "[directories]" > $(ASTETCDIR)/asterisk.conf | |
113 | - echo "astetcdir => $(ASTETCDIR)" >> $(ASTETCDIR)/asterisk.conf | |
114 | - echo "astmoddir => $(MODULES_DIR)" >> $(ASTETCDIR)/asterisk.conf | |
115 | - echo "astvarlibdir => $(ASTVARLIBDIR)" >> $(ASTETCDIR)/asterisk.conf | |
116 | - echo "astagidir => $(AGI_DIR)" >> $(ASTETCDIR)/asterisk.conf | |
117 | - echo "astspooldir => $(ASTSPOOLDIR)" >> $(ASTETCDIR)/asterisk.conf | |
118 | - echo "astrundir => $(ASTVARRUNDIR)" >> $(ASTETCDIR)/asterisk.conf | |
119 | - echo "astlogdir => $(ASTLOGDIR)" >> $(ASTETCDIR)/asterisk.conf | |
120 | + echo "[directories]" > $(DESTDIR)$(ASTETCDIR)/asterisk.conf | |
121 | + echo "astetcdir => $(ASTETCDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf | |
122 | + echo "astmoddir => $(MODULES_DIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf | |
123 | + echo "astvarlibdir => $(ASTVARLIBDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf | |
124 | + echo "astagidir => $(AGI_DIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf | |
125 | + echo "astspooldir => $(ASTSPOOLDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf | |
126 | + echo "astrundir => $(ASTVARRUNDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf | |
127 | + echo "astlogdir => $(ASTLOGDIR)" >> $(DESTDIR)$(ASTETCDIR)/asterisk.conf | |
128 | for x in sounds/demo-*; do \ | |
129 | if grep -q "^%`basename $$x`%" sounds.txt; then \ | |
130 | - install $$x $(ASTVARLIBDIR)/sounds ; \ | |
131 | + install $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \ | |
132 | else \ | |
133 | echo "No description for $$x"; \ | |
134 | exit 1; \ | |
135 | fi; \ | |
136 | done | |
137 | for x in sounds/*.mp3; do \ | |
138 | - install $$x $(ASTVARLIBDIR)/mohmp3 ; \ | |
139 | + install $$x $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 ; \ | |
140 | done | |
141 | - mkdir -p $(ASTSPOOLDIR)/vm/1234/INBOX | |
142 | - :> $(ASTVARLIBDIR)/sounds/vm/1234/unavail.gsm | |
143 | + mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/vm/1234/INBOX | |
144 | + :> $(DESTDIR)$(ASTVARLIBDIR)/sounds/vm/1234/unavail.gsm | |
145 | for x in vm-theperson digits/1 digits/2 digits/3 digits/4 vm-isunavail; do \ | |
146 | - cat $(ASTVARLIBDIR)/sounds/$$x.gsm >> $(ASTVARLIBDIR)/sounds/vm/1234/unavail.gsm ; \ | |
147 | + cat $(DESTDIR)$(ASTVARLIBDIR)/sounds/$$x.gsm >> $(DESTDIR)$(ASTVARLIBDIR)/sounds/vm/1234/unavail.gsm ; \ | |
148 | done | |
149 | - :> $(ASTVARLIBDIR)/sounds/vm/1234/busy.gsm | |
150 | + :> $(DESTDIR)$(ASTVARLIBDIR)/sounds/vm/1234/busy.gsm | |
151 | for x in vm-theperson digits/1 digits/2 digits/3 digits/4 vm-isonphone; do \ | |
152 | - cat $(ASTVARLIBDIR)/sounds/$$x.gsm >> $(ASTVARLIBDIR)/sounds/vm/1234/busy.gsm ; \ | |
153 | + cat $(DESTDIR)$(ASTVARLIBDIR)/sounds/$$x.gsm >> $(DESTDIR)$(ASTVARLIBDIR)/sounds/vm/1234/busy.gsm ; \ | |
154 | done | |
155 | ||
156 | webvmail: | |
157 | - @[ -d $(HTTPDIR) ] || ( echo "No HTTP directory" && exit 1 ) | |
158 | - @[ -d $(HTTPDIR)/html ] || ( echo "No http directory" && exit 1 ) | |
159 | - @[ -d $(HTTPDIR)/cgi-bin ] || ( echo "No cgi-bin directory" && exit 1 ) | |
160 | - install -m 4755 -o root -g root vmail.cgi $(HTTPDIR)/cgi-bin/vmail.cgi | |
161 | - mkdir -p $(HTTPDIR)/html/_asterisk | |
162 | + @[ -d $(DESTDIR)$(HTTPDIR) ] || ( echo "No HTTP directory" && exit 1 ) | |
163 | + @[ -d $(DESTDIR)$(HTTPDIR)/html ] || ( echo "No http directory" && exit 1 ) | |
164 | + @[ -d $(DESTDIR)$(HTTPDIR)/cgi-bin ] || ( echo "No cgi-bin directory" && exit 1 ) | |
165 | + install -m 4755 -o root -g root vmail.cgi $(DESTDIR)$(HTTPDIR)/cgi-bin/vmail.cgi | |
166 | + mkdir -p $(DESTDIR)$(HTTPDIR)/html/_asterisk | |
167 | for x in images/*.gif; do \ | |
168 | - install -m 644 $$x $(HTTPDIR)/html/_asterisk/; \ | |
169 | + install -m 644 $$x $(DESTDIR)$(HTTPDIR)/html/_asterisk/; \ | |
170 | done | |
171 | @echo " +--------- Asterisk Web Voicemail ----------+" | |
172 | @echo " + +" | |
173 | diff -urN asterisk-0.4.0-orig/agi/Makefile asterisk-0.4.0/agi/Makefile | |
174 | --- asterisk-0.4.0-orig/agi/Makefile Fri May 9 15:52:13 2003 | |
175 | +++ asterisk-0.4.0/agi/Makefile Fri May 9 15:52:30 2003 | |
176 | @@ -18,7 +18,7 @@ | |
177 | all: $(AGIS) | |
178 | ||
179 | install: all | |
180 | - for x in $(AGIS); do $(INSTALL) -m 755 $$x $(AGI_DIR) ; done | |
181 | + for x in $(AGIS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(AGI_DIR) ; done | |
182 | ||
183 | eagi-test: eagi-test.o | |
184 | $(CC) -o eagi-test eagi-test.o | |
185 | diff -urN asterisk-0.4.0-orig/apps/Makefile asterisk-0.4.0/apps/Makefile | |
186 | --- asterisk-0.4.0-orig/apps/Makefile Fri May 9 15:52:13 2003 | |
187 | +++ asterisk-0.4.0/apps/Makefile Fri May 9 15:52:30 2003 | |
188 | @@ -41,7 +41,7 @@ | |
189 | $(CC) -shared -Xlinker -x -o $@ $< -ltonezone | |
190 | ||
191 | install: all | |
192 | - for x in $(APPS); do $(INSTALL) -m 755 $$x $(MODULES_DIR) ; done | |
193 | + for x in $(APPS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done | |
194 | ||
195 | app_todd.o: app_todd.c | |
196 | gcc -pipe -O6 -g -Iinclude -I../include -D_REENTRANT -march=i586 -DDO_CRASH -c -o app_todd.o app_todd.c | |
197 | diff -urN asterisk-0.4.0-orig/astman/Makefile asterisk-0.4.0/astman/Makefile | |
198 | --- asterisk-0.4.0-orig/astman/Makefile Fri May 9 15:52:13 2003 | |
199 | +++ asterisk-0.4.0/astman/Makefile Fri May 9 15:52:30 2003 | |
200 | @@ -5,7 +5,7 @@ | |
201 | install: | |
202 | if [ "$(TARGET)" != "none" ]; then \ | |
203 | for x in $(TARGET); do \ | |
204 | - install -m 755 $$x $(ASTSBINDIR)/astman; \ | |
205 | + install -m 755 $$x $(DESTDIR)$(ASTSBINDIR)/astman; \ | |
206 | done ; \ | |
207 | fi | |
208 | ||
209 | diff -urN asterisk-0.4.0-orig/cdr/Makefile asterisk-0.4.0/cdr/Makefile | |
210 | --- asterisk-0.4.0-orig/cdr/Makefile Fri May 9 15:52:13 2003 | |
211 | +++ asterisk-0.4.0/cdr/Makefile Fri May 9 15:52:30 2003 | |
212 | @@ -30,7 +30,7 @@ | |
213 | all: $(MODS) | |
214 | ||
215 | install: all | |
216 | - for x in $(MODS); do $(INSTALL) -m 755 $$x $(MODULES_DIR) ; done | |
217 | + for x in $(MODS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done | |
218 | ||
219 | clean: | |
220 | rm -f *.so *.o | |
221 | diff -urN asterisk-0.4.0-orig/channels/Makefile asterisk-0.4.0/channels/Makefile | |
222 | --- asterisk-0.4.0-orig/channels/Makefile Fri May 9 15:52:13 2003 | |
223 | +++ asterisk-0.4.0/channels/Makefile Fri May 9 15:52:30 2003 | |
224 | @@ -95,4 +95,4 @@ | |
225 | # $(CC) -rdynamic -shared -Xlinker -x -o $@ $< | |
226 | ||
227 | install: all | |
228 | - for x in $(CHANNEL_LIBS); do $(INSTALL) -m 755 $$x $(MODULES_DIR) ; done | |
229 | + for x in $(CHANNEL_LIBS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done | |
230 | diff -urN asterisk-0.4.0-orig/channels/h323/Makefile asterisk-0.4.0/channels/h323/Makefile | |
231 | --- asterisk-0.4.0-orig/channels/h323/Makefile Fri May 9 15:52:13 2003 | |
232 | +++ asterisk-0.4.0/channels/h323/Makefile Fri May 9 15:52:30 2003 | |
233 | @@ -35,7 +35,7 @@ | |
234 | ||
235 | ||
236 | install: all | |
237 | - install -m 755 chan_h323.so $(ASTERISKDIR) | |
238 | + install -m 755 chan_h323.so $(DESTDIR)$(ASTERISKDIR) | |
239 | @echo " +----- chan_h323 Installation Complete ----- +" | |
240 | @echo " + +" | |
241 | @echo " + chan_h323 has successfully been installed. +" | |
242 | @@ -52,7 +52,7 @@ | |
243 | if [ -f $(ASTETCDIR)/h323.conf ]; then \ | |
244 | mv -f $(ASTETCDIR)/h323.conf $(ASTETCDIR)/h323.conf.old ; \ | |
245 | fi ; | |
246 | - install h323.conf.sample $(ASTETCDIR)/h323.conf | |
247 | + install h323.conf.sample $(DESTDIR)$(ASTETCDIR)/h323.conf | |
248 | ||
249 | ||
250 | chan_h323.o: chan_h323.c | |
251 | diff -urN asterisk-0.4.0-orig/codecs/Makefile asterisk-0.4.0/codecs/Makefile | |
252 | --- asterisk-0.4.0-orig/codecs/Makefile Fri May 9 15:52:13 2003 | |
253 | +++ asterisk-0.4.0/codecs/Makefile Fri May 9 15:52:30 2003 | |
254 | @@ -84,4 +84,4 @@ | |
255 | $(CC) -shared -Xlinker -x -o $@ $< | |
256 | ||
257 | install: all | |
258 | - for x in $(CODECS); do $(INSTALL) -m 755 $$x $(MODULES_DIR) ; done | |
259 | + for x in $(CODECS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done | |
260 | diff -urN asterisk-0.4.0-orig/formats/Makefile asterisk-0.4.0/formats/Makefile | |
261 | --- asterisk-0.4.0-orig/formats/Makefile Fri May 9 15:52:13 2003 | |
262 | +++ asterisk-0.4.0/formats/Makefile Fri May 9 15:52:30 2003 | |
263 | @@ -31,4 +31,4 @@ | |
264 | $(CC) -shared -Xlinker -x -o $@ $< -lm | |
265 | ||
266 | install: all | |
267 | - for x in $(FORMAT_LIBS); do $(INSTALL) -m 755 $$x $(MODULES_DIR) ; done | |
268 | + for x in $(FORMAT_LIBS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done | |
269 | diff -urN asterisk-0.4.0-orig/pbx/Makefile asterisk-0.4.0/pbx/Makefile | |
270 | --- asterisk-0.4.0-orig/pbx/Makefile Fri May 9 15:52:13 2003 | |
271 | +++ asterisk-0.4.0/pbx/Makefile Fri May 9 15:52:30 2003 | |
272 | @@ -58,4 +58,4 @@ | |
273 | $(CC) -shared -Xlinker -x -o $@ $< | |
274 | ||
275 | install: all | |
276 | - for x in $(PBX_LIBS); do $(INSTALL) -m 755 $$x $(MODULES_DIR) ; done | |
277 | + for x in $(PBX_LIBS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done | |
278 | diff -urN asterisk-0.4.0-orig/res/Makefile asterisk-0.4.0/res/Makefile | |
279 | --- asterisk-0.4.0-orig/res/Makefile Fri May 9 15:52:13 2003 | |
280 | +++ asterisk-0.4.0/res/Makefile Fri May 9 15:52:30 2003 | |
281 | @@ -25,7 +25,7 @@ | |
282 | all: $(MODS) | |
283 | ||
284 | install: all | |
285 | - for x in $(MODS); do $(INSTALL) -m 755 $$x $(MODULES_DIR) ; done | |
286 | + for x in $(MODS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done | |
287 | ||
288 | res_crypto.so: res_crypto.o | |
289 | $(CC) -shared -Xlinker -x -o $@ $< $(CRYPTO_LIBS) |