]>
Commit | Line | Data |
---|---|---|
8eb15d2d | 1 | diff -burNp eggdrop1.6.19/configure eggdrop1.6.19.new/configure |
2 | --- eggdrop1.6.19/configure 2008-04-19 06:21:20.000000000 +0200 | |
3 | +++ eggdrop1.6.19.new/configure 2008-09-22 09:29:38.000000000 +0200 | |
4 | @@ -315,7 +315,8 @@ ac_includes_default="\ | |
7d37d9db AG |
5 | # include <unistd.h> |
6 | #endif" | |
7 | ||
8 | -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS egg_ac_parameters CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA SET_MAKE RANLIB ac_ct_RANLIB LN_S HEAD_1 STRIP AWK BASENAME UNAME DEFAULT_MAKE MOD_EXT MODULE_XLIBS MOD_LD MOD_CC MOD_STRIP SHLIB_LD SHLIB_CC SHLIB_STRIP EGGEXEC TCLLIB TCLLIBFN TCLINC TCLINCFN TCL_REQS TCL_LIBS EGGVERSION DEST MOD_UPDIR LIBOBJS LTLIBOBJS' | |
9 | +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS egg_ac_parameters CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA SET_MAKE RANLIB ac_ct_RANLIB LN_S HEAD_1 STRIP AWK BASENAME UNAME DEFAULT_MAKE MOD_EXT MODULE_XLIBS MOD_LD MOD_CC MOD_STRIP SHLIB_LD SHLIB_CC SHLIB_STRIP EGGEXEC TCLLIB TCLLIBFN TCLINC TCLINCFN TCL_REQS TCL_LIBS EGGVERSION DESTDIR MOD_UPDIR LIBOBJS LTLIBOBJS' | |
8eb15d2d | 10 | + |
7d37d9db AG |
11 | ac_subst_files='' |
12 | ||
13 | # Initialize some variables set by options. | |
8eb15d2d | 14 | @@ -10129,8 +10130,8 @@ _ACEOF |
7d37d9db AG |
15 | |
16 | ||
17 | ||
18 | - if test "${DEST-x}" = "x"; then | |
19 | - DEST=\${prefix} | |
20 | + if test "${DESTDIR-x}" = "x"; then | |
21 | + DESTDIR=\${prefix} | |
22 | fi | |
23 | ||
24 | ||
8eb15d2d | 25 | @@ -10828,7 +10829,7 @@ s,@TCLINCFN@,$TCLINCFN,;t t |
7d37d9db AG |
26 | s,@TCL_REQS@,$TCL_REQS,;t t |
27 | s,@TCL_LIBS@,$TCL_LIBS,;t t | |
28 | s,@EGGVERSION@,$EGGVERSION,;t t | |
29 | -s,@DEST@,$DEST,;t t | |
30 | +s,@DESTDIR@,$DESTDIR,;t t | |
31 | s,@MOD_UPDIR@,$MOD_UPDIR,;t t | |
32 | s,@LIBOBJS@,$LIBOBJS,;t t | |
33 | s,@LTLIBOBJS@,$LTLIBOBJS,;t t | |
8eb15d2d | 34 | diff -burNp eggdrop1.6.19/doc/html/compiling.html eggdrop1.6.19.new/doc/html/compiling.html |
35 | --- eggdrop1.6.19/doc/html/compiling.html 2008-02-16 22:40:58.000000000 +0100 | |
36 | +++ eggdrop1.6.19.new/doc/html/compiling.html 2008-09-22 09:32:52.000000000 +0200 | |
7d37d9db AG |
37 | @@ -147,7 +147,7 @@ |
38 | ||
39 | <blockquote> | |
40 | <pre> | |
41 | -make install DEST=<directory> | |
42 | +make install DESTDIR=<directory> | |
43 | </pre> | |
44 | </blockquote> | |
45 | ||
8eb15d2d | 46 | @@ -155,7 +155,7 @@ make install DEST=<directory> |
7d37d9db AG |
47 | |
48 | <blockquote> | |
49 | <pre> | |
50 | -make install DEST=/home/user/otherdir | |
51 | +make install DESTDIR=/home/user/otherdir | |
52 | </pre> | |
53 | </blockquote> | |
54 | </ol> | |
8eb15d2d | 55 | @@ -255,7 +255,7 @@ sh5 ./configure --with-tclinc='<f |
7d37d9db AG |
56 | |
57 | <blockquote> | |
58 | <pre> | |
59 | -gmake install DEST='directory' | |
60 | +gmake install DESTDIR='directory' | |
61 | </pre> | |
62 | </blockquote> | |
63 | ||
8eb15d2d | 64 | @@ -263,7 +263,7 @@ gmake install DEST='directory' |
7d37d9db AG |
65 | |
66 | <blockquote> | |
67 | <pre> | |
68 | -gmake install DEST=/home/user/otherdir | |
69 | +gmake install DESTDIR=/home/user/otherdir | |
70 | </pre> | |
71 | </blockquote></li> | |
72 | </ol> | |
8eb15d2d | 73 | @@ -389,14 +389,14 @@ tar -zxf eggdrop1.6.19.tar.gz |
7d37d9db AG |
74 | |
75 | <li>Compile the bot using 'make eggdrop'.<br><br></li> | |
76 | ||
77 | - <li>Install the bot by typing 'make install DEST=<install | |
78 | + <li>Install the bot by typing 'make install DESTDIR=<install | |
79 | path>'.<br><br> | |
80 | ||
81 | For example: | |
82 | ||
83 | <blockquote> | |
84 | <pre> | |
85 | -make install DEST='C:/eggdrop/' | |
86 | +make install DESTDIR='C:/eggdrop/' | |
87 | </pre> | |
88 | </blockquote> | |
89 | ||
8eb15d2d | 90 | diff -burNp eggdrop1.6.19/doc/html/faqs.html eggdrop1.6.19.new/doc/html/faqs.html |
91 | --- eggdrop1.6.19/doc/html/faqs.html 2008-02-16 22:40:58.000000000 +0100 | |
92 | +++ eggdrop1.6.19.new/doc/html/faqs.html 2008-09-22 09:36:32.000000000 +0200 | |
7d37d9db AG |
93 | @@ -254,7 +254,7 @@ |
94 | ||
95 | <li> | |
96 | <p>If it's not your machine, you may have to resort to 'make | |
97 | - static' and 'make install DEST="path"' to make | |
98 | + static' and 'make install DESTDIR="path"' to make | |
99 | and install your bot.</p> | |
100 | </li> | |
101 | ||
8eb15d2d | 102 | diff -burNp eggdrop1.6.19/doc/html/install.html eggdrop1.6.19.new/doc/html/install.html |
103 | --- eggdrop1.6.19/doc/html/install.html 2008-02-16 22:40:58.000000000 +0100 | |
104 | +++ eggdrop1.6.19.new/doc/html/install.html 2008-09-22 09:39:15.000000000 +0200 | |
7d37d9db AG |
105 | @@ -100,13 +100,13 @@ |
106 | <p>If you want to install to a different directory, use:</p> | |
107 | ||
108 | <blockquote> | |
109 | - <p>make install DEST=<directory></p> | |
110 | + <p>make install DESTDIR=<directory></p> | |
111 | </blockquote> | |
112 | ||
113 | <p>For example:</p> | |
114 | ||
115 | <blockquote> | |
116 | - <p>make install DEST=/home/user/otherdir</p> | |
117 | + <p>make install DESTDIR=/home/user/otherdir</p> | |
118 | </blockquote> | |
119 | ||
120 | <p>Note that you must use full path for every file to be correctly | |
8eb15d2d | 121 | diff -burNp eggdrop1.6.19/doc/html/readme.html eggdrop1.6.19.new/doc/html/readme.html |
122 | --- eggdrop1.6.19/doc/html/readme.html 2008-02-16 22:40:59.000000000 +0100 | |
123 | +++ eggdrop1.6.19.new/doc/html/readme.html 2008-09-22 09:39:49.000000000 +0200 | |
7d37d9db AG |
124 | @@ -261,7 +261,7 @@ |
125 | <blockquote> | |
126 | <p>If you followed <a href="install.html">Compilation and | |
127 | Installation of Eggdrop</a> and did a 'make install' (or | |
128 | - 'make install DEST="path"') after 'make', | |
129 | + 'make install DESTDIR="path"') after 'make', | |
130 | this will be pretty easy. Just upload the new eggdrop1.6.x.tar.gz file | |
131 | to your home dir on your shell, gunzip and untar it, and type 'cd | |
132 | ~/eggdrop1.6.x'. Next, type './configure', 'make | |
8eb15d2d | 133 | diff -burNp eggdrop1.6.19/doc/html/starting.html eggdrop1.6.19.new/doc/html/starting.html |
134 | --- eggdrop1.6.19/doc/html/starting.html 2008-02-16 22:40:59.000000000 +0100 | |
135 | +++ eggdrop1.6.19.new/doc/html/starting.html 2008-09-22 09:42:21.000000000 +0200 | |
7d37d9db AG |
136 | @@ -97,7 +97,7 @@ |
137 | Eggdrop, you just have to do:</p> | |
138 | ||
139 | <blockquote> | |
140 | - <p><em>make DEST="directory" install</em></p> | |
141 | + <p><em>make DESTDIR="directory" install</em></p> | |
142 | </blockquote> | |
143 | ||
144 | <p>and it will copy all the necessary files.</p> | |
8eb15d2d | 145 | diff -burNp eggdrop1.6.19/doc/Makefile.in eggdrop1.6.19.new/doc/Makefile.in |
146 | --- eggdrop1.6.19/doc/Makefile.in 2004-08-08 20:17:00.000000000 +0200 | |
147 | +++ eggdrop1.6.19.new/doc/Makefile.in 2008-09-22 09:45:18.000000000 +0200 | |
148 | @@ -34,39 +34,39 @@ clean: | |
7d37d9db AG |
149 | @rm -f *~ |
150 | ||
151 | install: | |
152 | - @if test ! -d $(DEST)/doc; then \ | |
153 | + @if test ! -d $(DESTDIR)/doc; then \ | |
154 | echo "Creating 'doc' subdirectory."; \ | |
155 | - $(top_srcdir)/misc/mkinstalldirs $(DEST)/doc >/dev/null; \ | |
156 | + $(top_srcdir)/misc/mkinstalldirs $(DESTDIR)/doc >/dev/null; \ | |
157 | fi | |
158 | - @if test ! -d $(DEST)/doc/man1; then \ | |
159 | + @if test ! -d $(DESTDIR)/doc/man1; then \ | |
160 | echo "Creating 'doc/man1' subdirectory."; \ | |
161 | - $(top_srcdir)/misc/mkinstalldirs $(DEST)/doc/man1 >/dev/null; \ | |
162 | + $(top_srcdir)/misc/mkinstalldirs $(DESTDIR)/doc/man1 >/dev/null; \ | |
163 | fi | |
164 | - @if test ! -d $(DEST)/doc/html; then \ | |
165 | + @if test ! -d $(DESTDIR)/doc/html; then \ | |
166 | echo "Creating 'doc/html' subdirectory."; \ | |
167 | - $(top_srcdir)/misc/mkinstalldirs $(DEST)/doc/html >/dev/null; \ | |
168 | + $(top_srcdir)/misc/mkinstalldirs $(DESTDIR)/doc/html >/dev/null; \ | |
169 | fi | |
170 | - @if test ! -d $(DEST)/doc/settings; then \ | |
171 | + @if test ! -d $(DESTDIR)/doc/settings; then \ | |
172 | echo "Creating 'doc/settings' subdirectory."; \ | |
173 | - $(top_srcdir)/misc/mkinstalldirs $(DEST)/doc/settings >/dev/null; \ | |
174 | + $(top_srcdir)/misc/mkinstalldirs $(DESTDIR)/doc/settings >/dev/null; \ | |
175 | fi | |
176 | @echo "Copying docs." | |
177 | @for i in $(DOCS); do \ | |
178 | - $(INSTALL_DATA) $(srcdir)/$$i $(DEST)/doc/; \ | |
179 | + $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)/doc/; \ | |
180 | done | |
181 | @for i in $(MAN1); do \ | |
182 | - $(INSTALL_DATA) $(srcdir)/$$i $(DEST)/doc/man1/; \ | |
183 | + $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)/doc/man1/; \ | |
184 | done | |
185 | @for i in $(SETTING_DOCS); do \ | |
186 | - $(INSTALL_DATA) $(srcdir)/settings/$$i $(DEST)/doc/settings/; \ | |
187 | + $(INSTALL_DATA) $(srcdir)/settings/$$i $(DESTDIR)/doc/settings/; \ | |
188 | done | |
189 | @if test "x`echo $(SETTING_MOD_DOCS)`" != "x$(SETTING_MOD_DOCS)"; then \ | |
190 | for i in `echo $(SETTING_MOD_DOCS)`; do \ | |
191 | - $(INSTALL_DATA) $$i $(DEST)/doc/settings/; \ | |
192 | + $(INSTALL_DATA) $$i $(DESTDIR)/doc/settings/; \ | |
193 | done; \ | |
194 | fi | |
195 | @if test "x`echo $(WEB_DOCS)`" != "x$(WEB_DOCS)"; then \ | |
196 | for i in `echo $(WEB_DOCS)`; do \ | |
197 | - $(INSTALL_DATA) $$i $(DEST)/doc/html/; \ | |
198 | + $(INSTALL_DATA) $$i $(DESTDIR)/doc/html/; \ | |
199 | done; \ | |
200 | fi | |
8eb15d2d | 201 | diff -burNp eggdrop1.6.19/eggdrop.conf eggdrop1.6.19.new/eggdrop.conf |
202 | --- eggdrop1.6.19/eggdrop.conf 2008-02-16 21:15:30.000000000 +0100 | |
203 | +++ eggdrop1.6.19.new/eggdrop.conf 2008-09-22 09:52:43.000000000 +0200 | |
7d37d9db AG |
204 | @@ -1,4 +1,4 @@ |
205 | -#! /path/to/executable/eggdrop | |
206 | +#! /usr/bin/eggdrop | |
207 | # ^- This should contain a fully qualified path to your Eggdrop executable. | |
208 | # | |
209 | # $Id$ | |
8eb15d2d | 210 | @@ -185,22 +185,22 @@ set sort-users 0 |
7d37d9db AG |
211 | |
212 | # Specify here where Eggdrop should look for help files. Don't modify this | |
213 | # setting unless you know what you're doing! | |
214 | -set help-path "help/" | |
215 | +set help-path "/usr/share/eggdrop/help/" | |
216 | ||
217 | # Specify here where Eggdrop should look for text files. This is used for | |
218 | # certain Tcl and DCC commands. | |
219 | -set text-path "text/" | |
220 | +set text-path "/usr/share/eggdrop/" | |
221 | ||
222 | # Set here a place to store temporary files. | |
223 | set temp-path "/tmp" | |
224 | ||
225 | # The MOTD (Message Of The day) is displayed when people dcc chat or telnet | |
226 | # to the bot. Look at doc/TEXT-SUBSTITUTIONS for options. | |
227 | -set motd "text/motd" | |
228 | +set motd "/usr/share/eggdrop/motd" | |
229 | ||
230 | # This banner will be displayed on telnet connections. Look at | |
231 | # doc/TEXT-SUBSTITUTIONS for options. | |
232 | -set telnet-banner "text/banner" | |
233 | +set telnet-banner "/usr/share/eggdrop/banner" | |
234 | ||
235 | # This specifies what permissions the user, channel, and notes files should | |
236 | # be set to. The octal values are the same as for the chmod system command. | |
8eb15d2d | 237 | @@ -419,7 +419,7 @@ die "Please make sure you edit your conf |
7d37d9db AG |
238 | # If you run the bot from the compilation directory, you will want to set |
239 | # this to "". If you use 'make install' (like all good kiddies do ;), this | |
240 | # is a fine default. Otherwise, use your head :) | |
241 | -set mod-path "modules/" | |
242 | +set mod-path "/usr/lib/eggdrop/modules/" | |
243 | ||
244 | ||
8eb15d2d | 245 | #### BLOWFISH MODULE #### |
246 | @@ -1334,19 +1334,19 @@ loadmodule uptime | |
7d37d9db AG |
247 | # directory. All scripts should be put there, although you can place them where |
248 | # you like as long as you can supply a fully qualified path to them. | |
249 | # | |
250 | -# source scripts/script.tcl | |
8eb15d2d | 251 | +# /usr/share/eggdrop/scripts/script.tcl |
7d37d9db AG |
252 | |
253 | -source scripts/alltools.tcl | |
254 | -source scripts/action.fix.tcl | |
255 | +source /usr/share/eggdrop/scripts/alltools.tcl | |
256 | +source /usr/share/eggdrop/scripts/action.fix.tcl | |
257 | ||
8eb15d2d | 258 | # Use this script for Tcl and Eggdrop backwards compatibility. |
7d37d9db | 259 | # NOTE: This can also cause problems with some newer scripts. |
8eb15d2d | 260 | -#source scripts/compat.tcl |
7d37d9db AG |
261 | +source /usr/share/eggdrop/scripts/compat.tcl |
262 | ||
263 | # This script provides many useful informational functions, like setting | |
264 | # users' URLs, e-mail address, ICQ numbers, etc. You can modify it to add | |
265 | # extra entries. | |
266 | -source scripts/userinfo.tcl | |
267 | +source /usr/share/eggdrop/scripts/userinfo.tcl | |
268 | loadhelp userinfo.help | |
8eb15d2d | 269 | |
270 | # A few IRC networks (EFnet and Undernet) have added some simple checks to | |
271 | diff -burNp eggdrop1.6.19/INSTALL eggdrop1.6.19.new/INSTALL | |
272 | --- eggdrop1.6.19/INSTALL 2008-02-16 22:40:54.000000000 +0100 | |
273 | +++ eggdrop1.6.19.new/INSTALL 2008-09-22 09:53:40.000000000 +0200 | |
274 | @@ -66,11 +66,11 @@ Last revised: July 24, 2004 | |
16c0d484 | 275 | |
be355aca | 276 | If you want to install to a different directory, use: |
16c0d484 | 277 | |
be355aca | 278 | - make install DEST=<directory> |
279 | + make install DESTDIR=<directory> | |
16c0d484 | 280 | |
be355aca | 281 | For example: |
16c0d484 | 282 | |
be355aca | 283 | - make install DEST=/home/user/otherdir |
284 | + make install DESTDIR=/home/user/otherdir | |
16c0d484 | 285 | |
be355aca | 286 | Note that you must use full path for every file to be correctly |
287 | installed. | |
8eb15d2d | 288 | diff -burNp eggdrop1.6.19/Makefile.in eggdrop1.6.19.new/Makefile.in |
289 | --- eggdrop1.6.19/Makefile.in 2004-08-28 08:43:21.000000000 +0200 | |
290 | +++ eggdrop1.6.19.new/Makefile.in 2008-09-22 09:56:26.000000000 +0200 | |
291 | @@ -11,7 +11,7 @@ VPATH = @srcdir@ | |
16c0d484 | 292 | |
293 | @SET_MAKE@ | |
294 | prefix = @prefix@ | |
295 | -DEST = @DEST@ | |
296 | +DESTDIR = @DESTDIR@ | |
297 | EGGEXEC = @EGGEXEC@ | |
298 | EGGVERSION = @EGGVERSION@ | |
299 | ||
8eb15d2d | 300 | @@ -119,7 +119,7 @@ MAKE_DEPEND = $(MAKE) 'MAKE=$(MAKE)' 'CC |
16c0d484 | 301 | |
302 | MAKE_CONFIG = $(MAKE) 'MAKE=$(MAKE)' | |
303 | ||
304 | -MAKE_INSTALL = $(MAKE) 'MAKE=$(MAKE)' 'DEST=$(DEST)' | |
305 | +MAKE_INSTALL = $(MAKE) 'MAKE=$(MAKE)' 'DESTDIR=$(DESTDIR)' | |
306 | ||
307 | all: @DEFAULT_MAKE@ | |
308 | ||
8eb15d2d | 309 | @@ -308,109 +308,109 @@ install-start: |
16c0d484 | 310 | echo ""; \ |
311 | exit 1; \ | |
312 | fi | |
313 | - @if test "x$(DEST)" = "x"; then \ | |
16c0d484 | 314 | + @if test "x$(DESTDIR)" = "x"; then \ |
7d37d9db AG |
315 | echo "You must specify a destination directory."; \ |
316 | echo "Example:"; \ | |
317 | echo ""; \ | |
318 | - echo " make install DEST=\"/home/wcc/mybot\""; \ | |
319 | + echo " make install DESTDIR=\"/home/wcc/mybot\""; \ | |
320 | echo ""; \ | |
16c0d484 | 321 | exit 1; \ |
322 | fi | |
323 | @echo "" | |
324 | @$(egg_test_run) | |
7d37d9db | 325 | @echo "" |
16c0d484 | 326 | - @echo "Installing in directory: '$(DEST)'." |
327 | + @echo "Installing in directory: '$(DESTDIR)'." | |
7d37d9db | 328 | @echo "" |
16c0d484 | 329 | - @if test ! -d $(DEST); then \ |
7d37d9db AG |
330 | - echo "Creating directory '$(DEST)'."; \ |
331 | - $(top_srcdir)/misc/mkinstalldirs $(DEST) >/dev/null; \ | |
16c0d484 | 332 | + @if test ! -d $(DESTDIR); then \ |
7d37d9db AG |
333 | + echo "Creating directory '$(DESTDIR)'."; \ |
334 | + $(top_srcdir)/misc/mkinstalldirs $(DESTDIR) >/dev/null; \ | |
16c0d484 | 335 | fi |
336 | ||
337 | install-bin: | |
338 | - @if test -f $(DEST)/o$(EGGEXEC); then \ | |
339 | - rm -f $(DEST)/o$(EGGEXEC); \ | |
340 | + @if test -f $(DESTDIR)/o$(EGGEXEC); then \ | |
341 | + rm -f $(DESTDIR)/o$(EGGEXEC); \ | |
342 | fi | |
343 | - @if test -h $(DEST)/$(EGGEXEC); then \ | |
344 | + @if test -h $(DESTDIR)/$(EGGEXEC); then \ | |
345 | echo "Removing symlink to archival eggdrop binary."; \ | |
346 | - rm -f $(DEST)/$(EGGEXEC); \ | |
347 | + rm -f $(DESTDIR)/$(EGGEXEC); \ | |
348 | fi | |
349 | - @if test -f $(DEST)/$(EGGEXEC); then \ | |
350 | + @if test -f $(DESTDIR)/$(EGGEXEC); then \ | |
7d37d9db | 351 | echo "Renaming old '$(EGGEXEC)' executable to 'o$(EGGEXEC)'."; \ |
16c0d484 | 352 | - mv -f $(DEST)/$(EGGEXEC) $(DEST)/o$(EGGEXEC); \ |
353 | + mv -f $(DESTDIR)/$(EGGEXEC) $(DESTDIR)/o$(EGGEXEC); \ | |
354 | fi | |
355 | @echo "Copying new '$(EGGEXEC)' executable and creating symlink." | |
356 | - @$(INSTALL_PROGRAM) $(EGGEXEC) $(DEST)/$(EGGEXEC)-$(EGGVERSION) | |
357 | - @(cd $(DEST) && $(LN_S) $(EGGEXEC)-$(EGGVERSION) $(EGGEXEC)) | |
358 | + @$(INSTALL_PROGRAM) $(EGGEXEC) $(DESTDIR)/$(EGGEXEC)-$(EGGVERSION) | |
359 | + @(cd $(DESTDIR) && $(LN_S) $(EGGEXEC)-$(EGGVERSION) $(EGGEXEC)) | |
360 | ||
361 | install-modules: | |
362 | - @if test -h $(DEST)/modules; then \ | |
363 | + @if test -h $(DESTDIR)/modules; then \ | |
7d37d9db | 364 | echo "Removing symlink to archival modules subdirectory."; \ |
16c0d484 | 365 | - rm -f $(DEST)/modules; \ |
366 | + rm -f $(DESTDIR)/modules; \ | |
367 | fi | |
368 | - @if test -d $(DEST)/modules; then \ | |
369 | + @if test -d $(DESTDIR)/modules; then \ | |
7d37d9db | 370 | echo "Moving old modules into 'modules.old' subdirectory."; \ |
16c0d484 | 371 | - rm -rf $(DEST)/modules.old; \ |
372 | - mv -f $(DEST)/modules $(DEST)/modules.old; \ | |
373 | + rm -rf $(DESTDIR)/modules.old; \ | |
374 | + mv -f $(DESTDIR)/modules $(DESTDIR)/modules.old; \ | |
375 | fi | |
376 | @if test ! "x`echo *.$(MOD_EXT)`" = "x*.$(MOD_EXT)"; then \ | |
377 | - if test ! -d $(DEST)/modules-$(EGGVERSION); then \ | |
378 | + if test ! -d $(DESTDIR)/modules-$(EGGVERSION); then \ | |
7d37d9db AG |
379 | echo "Creating 'modules-$(EGGVERSION)' subdirectory and symlink."; \ |
380 | - $(top_srcdir)/misc/mkinstalldirs $(DEST)/modules-$(EGGVERSION) >/dev/null; \ | |
381 | + $(top_srcdir)/misc/mkinstalldirs $(DESTDIR)/modules-$(EGGVERSION) >/dev/null; \ | |
16c0d484 | 382 | fi; \ |
383 | - (cd $(DEST) && $(LN_S) modules-$(EGGVERSION) modules); \ | |
384 | + (cd $(DESTDIR) && $(LN_S) modules-$(EGGVERSION) modules); \ | |
385 | echo "Copying new modules."; \ | |
386 | for i in *.$(MOD_EXT); do \ | |
387 | - $(INSTALL_PROGRAM) $$i $(DEST)/modules-$(EGGVERSION)/; \ | |
388 | + $(INSTALL_PROGRAM) $$i $(DESTDIR)/modules-$(EGGVERSION)/; \ | |
389 | done; \ | |
390 | fi | |
391 | ||
392 | install-data: | |
be355aca | 393 | - @if test ! -f $(DEST)/eggdrop.conf; then \ |
394 | - $(INSTALL_DATA) $(srcdir)/eggdrop.conf $(DEST)/; \ | |
395 | + @if test ! -f $(DESTDIR)/eggdrop.conf; then \ | |
396 | + $(INSTALL_DATA) $(srcdir)/eggdrop.conf $(DESTDIR)/; \ | |
397 | fi | |
16c0d484 | 398 | - @if test ! -d $(DEST)/logs; then \ |
16c0d484 | 399 | + @if test ! -d $(DESTDIR)/logs; then \ |
400 | echo "Creating 'logs' subdirectory."; \ | |
7d37d9db | 401 | - $(top_srcdir)/misc/mkinstalldirs $(DEST)/logs >/dev/null; \ |
16c0d484 | 402 | - $(INSTALL_DATA) $(srcdir)/logs/CONTENTS $(DEST)/logs/; \ |
7d37d9db | 403 | + $(top_srcdir)/misc/mkinstalldirs $(DESTDIR)/logs >/dev/null; \ |
16c0d484 | 404 | + $(INSTALL_DATA) $(srcdir)/logs/CONTENTS $(DESTDIR)/logs/; \ |
405 | fi; | |
406 | - @if test ! -d $(DEST)/text; then \ | |
407 | + @if test ! -d $(DESTDIR)/text; then \ | |
408 | echo "Creating 'text' subdirectory."; \ | |
7d37d9db AG |
409 | - $(top_srcdir)/misc/mkinstalldirs $(DEST)/text >/dev/null; \ |
410 | + $(top_srcdir)/misc/mkinstalldirs $(DESTDIR)/text >/dev/null; \ | |
16c0d484 | 411 | fi; |
412 | - @if test ! -f $(DEST)/text/motd; then \ | |
413 | - $(INSTALL_DATA) $(srcdir)/text/motd $(DEST)/text/; \ | |
414 | + @if test ! -f $(DESTDIR)/text/motd; then \ | |
415 | + $(INSTALL_DATA) $(srcdir)/text/motd $(DESTDIR)/text/; \ | |
416 | fi | |
417 | - @if test ! -f $(DEST)/text/banner; then \ | |
418 | - $(INSTALL_DATA) $(srcdir)/text/banner $(DEST)/text/; \ | |
419 | + @if test ! -f $(DESTDIR)/text/banner; then \ | |
420 | + $(INSTALL_DATA) $(srcdir)/text/banner $(DESTDIR)/text/; \ | |
421 | fi | |
422 | ||
423 | install-help: | |
424 | @echo "Copying help files." | |
425 | @if test ! "x`echo $(srcdir)/help/*.help`" = "x$(srcdir)/help/*.help"; then \ | |
426 | - if test ! -d $(DEST)/help; then \ | |
427 | + if test ! -d $(DESTDIR)/help; then \ | |
428 | echo "Creating 'help' subdirectory."; \ | |
7d37d9db AG |
429 | - $(top_srcdir)/misc/mkinstalldirs $(DEST)/help >/dev/null; \ |
430 | + $(top_srcdir)/misc/mkinstalldirs $(DESTDIR)/help >/dev/null; \ | |
16c0d484 | 431 | fi; \ |
432 | for i in $(srcdir)/help/*.help; do \ | |
433 | - $(INSTALL_DATA) $$i $(DEST)/help/; \ | |
434 | + $(INSTALL_DATA) $$i $(DESTDIR)/help/; \ | |
435 | done; \ | |
436 | fi | |
437 | @if test ! "x`echo $(srcdir)/help/msg/*.help`" = "x$(srcdir)/help/msg/*.help"; then \ | |
438 | - if test ! -d $(DEST)/help/msg; then \ | |
439 | + if test ! -d $(DESTDIR)/help/msg; then \ | |
440 | echo "Creating 'help/msg' subdirectory."; \ | |
7d37d9db AG |
441 | - $(top_srcdir)/misc/mkinstalldirs $(DEST)/help/msg >/dev/null; \ |
442 | + $(top_srcdir)/misc/mkinstalldirs $(DESTDIR)/help/msg >/dev/null; \ | |
16c0d484 | 443 | fi; \ |
444 | for i in $(srcdir)/help/msg/*.help; do \ | |
445 | - $(INSTALL_DATA) $$i $(DEST)/help/msg/; \ | |
446 | + $(INSTALL_DATA) $$i $(DESTDIR)/help/msg/; \ | |
447 | done; \ | |
448 | fi | |
449 | @if test ! "x`echo $(srcdir)/help/set/*.help`" = "x$(srcdir)/help/set/*.help"; then \ | |
450 | - if test ! -d $(DEST)/help/set; then \ | |
451 | + if test ! -d $(DESTDIR)/help/set; then \ | |
452 | echo "Creating 'help/set' subdirectory."; \ | |
7d37d9db AG |
453 | - $(top_srcdir)/misc/mkinstalldirs $(DEST)/help/set >/dev/null; \ |
454 | + $(top_srcdir)/misc/mkinstalldirs $(DESTDIR)/help/set >/dev/null; \ | |
16c0d484 | 455 | fi; \ |
456 | for i in $(srcdir)/help/set/*.help; do \ | |
457 | - $(INSTALL_DATA) $$i $(DEST)/help/set/; \ | |
458 | + $(INSTALL_DATA) $$i $(DESTDIR)/help/set/; \ | |
459 | done; \ | |
460 | fi | |
461 | @cd src/mod/ && $(MAKE_INSTALL) install-help | |
8eb15d2d | 462 | @@ -418,25 +418,25 @@ install-help: |
16c0d484 | 463 | install-language: |
464 | @echo "Copying language files." | |
465 | @if test ! "x`echo $(srcdir)/language/*.lang`" = "x$(srcdir)/language/*.lang"; then \ | |
466 | - if test ! -d $(DEST)/language; then \ | |
467 | + if test ! -d $(DESTDIR)/language; then \ | |
468 | echo "Creating 'language' subdirectory."; \ | |
7d37d9db AG |
469 | - $(top_srcdir)/misc/mkinstalldirs $(DEST)/language >/dev/null; \ |
470 | + $(top_srcdir)/misc/mkinstalldirs $(DESTDIR)/language >/dev/null; \ | |
16c0d484 | 471 | fi; \ |
472 | for i in $(srcdir)/language/*.lang; do \ | |
473 | - $(INSTALL_DATA) $$i $(DEST)/language/; \ | |
474 | + $(INSTALL_DATA) $$i $(DESTDIR)/language/; \ | |
475 | done; \ | |
476 | fi | |
477 | @cd src/mod && $(MAKE_INSTALL) install-language | |
478 | ||
479 | install-filesys: | |
480 | - @if test ! -d $(DEST)/filesys; then \ | |
481 | + @if test ! -d $(DESTDIR)/filesys; then \ | |
7d37d9db AG |
482 | echo "Creating skeletal filesystem subdirectories."; \ |
483 | - $(top_srcdir)/misc/mkinstalldirs $(DEST)/filesys >/dev/null; \ | |
484 | - $(top_srcdir)/misc/mkinstalldirs $(DEST)/filesys/incoming >/dev/null; \ | |
485 | + $(top_srcdir)/misc/mkinstalldirs $(DESTDIR)/filesys >/dev/null; \ | |
486 | + $(top_srcdir)/misc/mkinstalldirs $(DESTDIR)/filesys/incoming >/dev/null; \ | |
16c0d484 | 487 | fi |
488 | ||
489 | install-doc: | |
490 | - @$(INSTALL_DATA) $(srcdir)/README $(DEST) | |
491 | + @$(INSTALL_DATA) $(srcdir)/README $(DESTDIR) | |
492 | @cd doc/ && $(MAKE_INSTALL) install | |
493 | ||
494 | install-scripts: | |
8eb15d2d | 495 | @@ -449,7 +449,7 @@ install-end: |
16c0d484 | 496 | @echo "You MUST ensure that you edit/verify your configuration file." |
be355aca | 497 | @echo "An example configuration file, eggdrop.conf, is distributed with Eggdrop." |
16c0d484 | 498 | @echo "" |
499 | - @echo "Remember to change directory to $(DEST) before you proceed." | |
500 | + @echo "Remember to change directory to $(DESTDIR) before you proceed." | |
501 | @echo "" | |
502 | ||
503 | #safety hash | |
8eb15d2d | 504 | diff -burNp eggdrop1.6.19/scripts/Makefile.in eggdrop1.6.19.new/scripts/Makefile.in |
505 | --- eggdrop1.6.19/scripts/Makefile.in 2008-02-16 07:00:17.000000000 +0100 | |
506 | +++ eggdrop1.6.19.new/scripts/Makefile.in 2008-09-22 09:58:28.000000000 +0200 | |
507 | @@ -32,44 +32,44 @@ clean: | |
16c0d484 | 508 | @rm -f *~ |
509 | ||
510 | install: | |
511 | - @if test ! -d $(DEST)/scripts; then \ | |
512 | + @if test ! -d $(DESTDIR)/scripts; then \ | |
7d37d9db AG |
513 | echo "Creating 'scripts' subdirectory."; \ |
514 | - $(top_srcdir)/misc/mkinstalldirs $(DEST)/scripts >/dev/null; \ | |
515 | + $(top_srcdir)/misc/mkinstalldirs $(DESTDIR)/scripts >/dev/null; \ | |
16c0d484 | 516 | echo "Copying scripts."; \ |
517 | for i in $(DOCS); do \ | |
518 | - $(INSTALL_DATA) $(srcdir)/$$i $(DEST)/scripts/; \ | |
519 | + $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)/scripts/; \ | |
520 | done; \ | |
521 | for i in $(SCRIPTS); do \ | |
522 | - $(INSTALL_DATA) $(srcdir)/$$i $(DEST)/scripts/; \ | |
523 | + $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)/scripts/; \ | |
524 | done; \ | |
525 | for i in $(EXESCRIPTS); do \ | |
526 | - $(INSTALL_SCRIPT) $(srcdir)/$$i $(DEST)/scripts/; \ | |
527 | + $(INSTALL_SCRIPT) $(srcdir)/$$i $(DESTDIR)/scripts/; \ | |
528 | done; \ | |
529 | if test ! "x`echo $(srcdir)/help/*.help`" = "x$(srcdir)/help/*.help"; then \ | |
530 | - if test ! -d $(DEST)/help; then \ | |
531 | + if test ! -d $(DESTDIR)/help; then \ | |
532 | echo "Creating 'help' subdirectory."; \ | |
7d37d9db AG |
533 | - $(top_srcdir)/misc/mkinstalldirs $(DEST)/help >/dev/null; \ |
534 | + $(top_srcdir)/misc/mkinstalldirs $(DESTDIR)/help >/dev/null; \ | |
16c0d484 | 535 | fi; \ |
536 | for i in $(srcdir)/help/*.help; do \ | |
537 | - $(INSTALL_DATA) $$i $(DEST)/help/; \ | |
538 | + $(INSTALL_DATA) $$i $(DESTDIR)/help/; \ | |
539 | done; \ | |
540 | fi; \ | |
541 | if test ! "x`echo $(srcdir)/help/msg/*.help`" = "x$(srcdir)/help/msg/*.help"; then \ | |
542 | - if test ! -d $(DEST)/help/msg; then \ | |
543 | + if test ! -d $(DESTDIR)/help/msg; then \ | |
544 | echo "Creating 'help/msg' subdirectory."; \ | |
7d37d9db AG |
545 | - $(top_srcdir)/misc/mkinstalldirs $(DEST)/help/msg >/dev/null; \ |
546 | + $(top_srcdir)/misc/mkinstalldirs $(DESTDIR)/help/msg >/dev/null; \ | |
16c0d484 | 547 | fi; \ |
548 | for i in $(srcdir)/help/msg/*.help; do \ | |
549 | - $(INSTALL_DATA) $$i $(DEST)/help/msg/; \ | |
550 | + $(INSTALL_DATA) $$i $(DESTDIR)/help/msg/; \ | |
551 | done; \ | |
552 | fi; \ | |
553 | if test ! "x`echo $(srcdir)/help/set/*.help`" = "x$(srcdir)/help/set/*.help"; then \ | |
554 | - if test ! -d $(DEST)/help/set; then \ | |
555 | + if test ! -d $(DESTDIR)/help/set; then \ | |
556 | echo "Creating 'help/set' subdirectory."; \ | |
7d37d9db AG |
557 | - $(top_srcdir)/misc/mkinstalldirs $(DEST)/help/set >/dev/null; \ |
558 | + $(top_srcdir)/misc/mkinstalldirs $(DESTDIR)/help/set >/dev/null; \ | |
16c0d484 | 559 | fi; \ |
560 | for i in $(srcdir)/help/set/*.help; do \ | |
561 | - $(INSTALL_DATA) $$i $(DEST)/help/set/; \ | |
562 | + $(INSTALL_DATA) $$i $(DESTDIR)/help/set/; \ | |
563 | done; \ | |
564 | fi; \ | |
565 | fi | |
8eb15d2d | 566 | diff -burNp eggdrop1.6.19/src/eggdrop.h eggdrop1.6.19.new/src/eggdrop.h |
567 | --- eggdrop1.6.19/src/eggdrop.h 2008-02-16 22:41:03.000000000 +0100 | |
568 | +++ eggdrop1.6.19.new/src/eggdrop.h 2008-09-22 10:00:48.000000000 +0200 | |
7d37d9db | 569 | @@ -75,7 +75,7 @@ |
be355aca | 570 | |
be355aca | 571 | |
31bc0dcd AG |
572 | /* Language stuff */ |
573 | -#define LANGDIR "./language" /* language file directory */ | |
574 | +#define LANGDIR "/usr/share/eggdrop/language" /* language file directory */ | |
7d37d9db | 575 | #define BASELANG "english" /* language which always gets loaded before |
31bc0dcd AG |
576 | all other languages. You do not want to |
577 | change this. */ | |
8eb15d2d | 578 | diff -burNp eggdrop1.6.19/src/mod/Makefile.in eggdrop1.6.19.new/src/mod/Makefile.in |
579 | --- eggdrop1.6.19/src/mod/Makefile.in 2004-08-28 08:43:22.000000000 +0200 | |
580 | +++ eggdrop1.6.19.new/src/mod/Makefile.in 2008-09-22 10:02:45.000000000 +0200 | |
581 | @@ -123,50 +123,50 @@ install: install-help install-language | |
16c0d484 | 582 | |
583 | install-help: | |
584 | @echo "Copying module help files." | |
585 | - @if test ! -d $(DEST)/help; then \ | |
586 | + @if test ! -d $(DESTDIR)/help; then \ | |
587 | echo "Creating 'help' subdirectory."; \ | |
7d37d9db AG |
588 | - $(top_srcdir)/misc/mkinstalldirs $(DEST)/help >/dev/null; \ |
589 | + $(top_srcdir)/misc/mkinstalldirs $(DESTDIR)/help >/dev/null; \ | |
16c0d484 | 590 | fi; \ |
591 | for i in $(mods); do \ | |
592 | if test ! "x`echo $(srcdir)/$$i/help/*.help`" = "x$(srcdir)/$$i/help/*.help"; then \ | |
593 | for h in $(srcdir)/$$i/help/*.help; do \ | |
594 | - $(INSTALL_DATA) $$h $(DEST)/help/; \ | |
595 | + $(INSTALL_DATA) $$h $(DESTDIR)/help/; \ | |
596 | done; \ | |
597 | fi; \ | |
598 | done; | |
599 | - @if test ! -d $(DEST)/help/msg; then \ | |
600 | + @if test ! -d $(DESTDIR)/help/msg; then \ | |
601 | echo "Creating 'help/msg' subdirectory."; \ | |
7d37d9db AG |
602 | - $(top_srcdir)/misc/mkinstalldirs $(DEST)/help/msg >/dev/null; \ |
603 | + $(top_srcdir)/misc/mkinstalldirs $(DESTDIR)/help/msg >/dev/null; \ | |
16c0d484 | 604 | fi; \ |
605 | for i in $(mods); do \ | |
606 | if test ! "x`echo $(srcdir)/$$i/help/msg/*.help`" = "x$(srcdir)/$$i/help/msg/*.help"; then \ | |
607 | for h in $(srcdir)/$$i/help/msg/*.help; do \ | |
608 | - $(INSTALL_DATA) $$h $(DEST)/help/msg/; \ | |
609 | + $(INSTALL_DATA) $$h $(DESTDIR)/help/msg/; \ | |
610 | done; \ | |
611 | fi; \ | |
612 | done; | |
613 | - @if test ! -d $(DEST)/help/set; then \ | |
614 | + @if test ! -d $(DESTDIR)/help/set; then \ | |
615 | echo "Creating 'help/set' subdirectory."; \ | |
7d37d9db AG |
616 | - $(top_srcdir)/misc/mkinstalldirs $(DEST)/help/set >/dev/null; \ |
617 | + $(top_srcdir)/misc/mkinstalldirs $(DESTDIR)/help/set >/dev/null; \ | |
16c0d484 | 618 | fi; \ |
619 | for i in $(mods); do \ | |
620 | if test ! "x`echo $(srcdir)/$$i/help/set/*.help`" = "x$(srcdir)/$$i/help/set/*.help"; then \ | |
621 | for h in $(srcdir)/$$i/help/set/*.help; do \ | |
622 | - $(INSTALL_DATA) $$h $(DEST)/help/set/; \ | |
623 | + $(INSTALL_DATA) $$h $(DESTDIR)/help/set/; \ | |
624 | done; \ | |
625 | fi; \ | |
626 | done; | |
627 | ||
628 | install-language: | |
629 | @echo "Copying module language files." | |
630 | - @if test ! -d $(DEST)/language; then \ | |
631 | + @if test ! -d $(DESTDIR)/language; then \ | |
632 | echo "Creating 'language' subdirectory."; \ | |
7d37d9db AG |
633 | - $(top_srcdir)/misc/mkinstalldirs $(DEST)/language >/dev/null; \ |
634 | + $(top_srcdir)/misc/mkinstalldirs $(DESTDIR)/language >/dev/null; \ | |
16c0d484 | 635 | fi; \ |
636 | for i in $(mods); do \ | |
637 | if test ! "x`echo $(srcdir)/$$i/language/*.lang`" = "x$(srcdir)/$$i/language/*.lang"; then \ | |
638 | for h in $(srcdir)/$$i/language/*.lang; do \ | |
639 | - $(INSTALL_DATA) $$h $(DEST)/language/; \ | |
640 | + $(INSTALL_DATA) $$h $(DESTDIR)/language/; \ | |
641 | done; \ | |
642 | fi; \ | |
643 | done; | |
450768db | 644 | diff -burNp eggdrop1.6.19/eggdrop.conf eggdrop1.6.19-new/eggdrop.conf |
645 | --- eggdrop1.6.19/eggdrop.conf 2008-02-16 21:15:30.000000000 +0100 | |
646 | +++ eggdrop1.6.19-new/eggdrop.conf 2008-09-23 19:10:36.435603076 +0200 | |
647 | @@ -1359,11 +1359,11 @@ if {[info exists net-type]} { | |
648 | switch -- ${net-type} { | |
649 | "0" { | |
650 | # EFnet | |
651 | - source scripts/quotepong.tcl | |
652 | + source /usr/share/eggdrop/scripts/quotepong.tcl | |
653 | } | |
654 | "2" { | |
655 | # Undernet | |
656 | - source scripts/quotepass.tcl | |
657 | + source /usr/share/eggdrop/scripts/quotepass.tcl | |
658 | } | |
659 | } | |
660 | } |