projects / packages / eggdrop.git / blame
| Commit | Line | Data |
|---|---|---|
| 31bc0dcd AG |
1 | diff -urN eggdrop1.6.15/INSTALL eggdrop1.6.15-FHS/INSTALL |
| 2 | --- eggdrop1.6.15/INSTALL Mon May 5 00:05:32 2003 | |
| 3 | +++ eggdrop1.6.15-FHS/INSTALL Mon May 5 17:55:48 2003 | |
| be355aca | 4 | @@ -61,11 +61,11 @@ |
| 16c0d484 | 5 | |
| be355aca | 6 | If you want to install to a different directory, use: |
| 16c0d484 | 7 | |
| be355aca | 8 | - make install DEST=<directory> |
| 9 | + make install DESTDIR=<directory> | |
| 16c0d484 | 10 | |
| be355aca | 11 | For example: |
| 16c0d484 | 12 | |
| be355aca | 13 | - make install DEST=/home/user/otherdir |
| 14 | + make install DESTDIR=/home/user/otherdir | |
| 16c0d484 | 15 | |
| be355aca | 16 | Note that you must use full path for every file to be correctly |
| 17 | installed. | |
| 31bc0dcd AG |
18 | diff -urN eggdrop1.6.15/Makefile.in eggdrop1.6.15-FHS/Makefile.in |
| 19 | --- eggdrop1.6.15/Makefile.in Mon May 5 00:05:32 2003 | |
| 20 | +++ eggdrop1.6.15-FHS/Makefile.in Mon May 5 17:55:48 2003 | |
| 16c0d484 | 21 | @@ -11,7 +11,7 @@ |
| 22 | ||
| 23 | @SET_MAKE@ | |
| 24 | prefix = @prefix@ | |
| 25 | -DEST = @DEST@ | |
| 26 | +DESTDIR = @DESTDIR@ | |
| 27 | EGGEXEC = @EGGEXEC@ | |
| 28 | EGGVERSION = @EGGVERSION@ | |
| 29 | ||
| 30 | @@ -116,7 +116,7 @@ | |
| 31 | ||
| 32 | MAKE_CONFIG = $(MAKE) 'MAKE=$(MAKE)' | |
| 33 | ||
| 34 | -MAKE_INSTALL = $(MAKE) 'MAKE=$(MAKE)' 'DEST=$(DEST)' | |
| 35 | +MAKE_INSTALL = $(MAKE) 'MAKE=$(MAKE)' 'DESTDIR=$(DESTDIR)' | |
| 36 | ||
| 37 | all: @DEFAULT_MAKE@ | |
| 38 | ||
| 39 | @@ -301,105 +301,105 @@ | |
| 40 | echo ""; \ | |
| 41 | exit 1; \ | |
| 42 | fi | |
| 43 | - @if test "x$(DEST)" = "x"; then \ | |
| 44 | - echo "You must specify a destination directory with DEST="; \ | |
| 45 | + @if test "x$(DESTDIR)" = "x"; then \ | |
| 46 | + echo "You must specify a destination directory with DESTDIR="; \ | |
| 47 | exit 1; \ | |
| 48 | fi | |
| 49 | @echo "" | |
| 50 | @$(egg_test_run) | |
| 51 | @echo | |
| 52 | - @echo "Installing in directory: '$(DEST)'." | |
| 53 | + @echo "Installing in directory: '$(DESTDIR)'." | |
| 54 | @echo | |
| 55 | - @if test ! -d $(DEST); then \ | |
| 56 | - echo "Creating directory: $(DEST)."; \ | |
| 57 | - $(top_srcdir)/misc/mkinstalldirs $(DEST); \ | |
| 58 | + @if test ! -d $(DESTDIR); then \ | |
| 59 | + echo "Creating directory: $(DESTDIR)."; \ | |
| 60 | + $(top_srcdir)/misc/mkinstalldirs $(DESTDIR); \ | |
| 61 | fi | |
| 62 | ||
| 63 | install-bin: | |
| 64 | - @if test -f $(DEST)/o$(EGGEXEC); then \ | |
| 65 | - rm -f $(DEST)/o$(EGGEXEC); \ | |
| 66 | + @if test -f $(DESTDIR)/o$(EGGEXEC); then \ | |
| 67 | + rm -f $(DESTDIR)/o$(EGGEXEC); \ | |
| 68 | fi | |
| 69 | - @if test -h $(DEST)/$(EGGEXEC); then \ | |
| 70 | + @if test -h $(DESTDIR)/$(EGGEXEC); then \ | |
| 71 | echo "Removing symlink to archival eggdrop binary."; \ | |
| 72 | - rm -f $(DEST)/$(EGGEXEC); \ | |
| 73 | + rm -f $(DESTDIR)/$(EGGEXEC); \ | |
| 74 | fi | |
| 75 | - @if test -f $(DEST)/$(EGGEXEC); then \ | |
| 76 | + @if test -f $(DESTDIR)/$(EGGEXEC); then \ | |
| 77 | echo "Renamed the old '$(EGGEXEC)' executable to 'o$(EGGEXEC)'."; \ | |
| 78 | - mv -f $(DEST)/$(EGGEXEC) $(DEST)/o$(EGGEXEC); \ | |
| 79 | + mv -f $(DESTDIR)/$(EGGEXEC) $(DESTDIR)/o$(EGGEXEC); \ | |
| 80 | fi | |
| 81 | @echo "Copying new '$(EGGEXEC)' executable and creating symlink." | |
| 82 | - @$(INSTALL_PROGRAM) $(EGGEXEC) $(DEST)/$(EGGEXEC)-$(EGGVERSION) | |
| 83 | - @(cd $(DEST) && $(LN_S) $(EGGEXEC)-$(EGGVERSION) $(EGGEXEC)) | |
| 84 | + @$(INSTALL_PROGRAM) $(EGGEXEC) $(DESTDIR)/$(EGGEXEC)-$(EGGVERSION) | |
| 85 | + @(cd $(DESTDIR) && $(LN_S) $(EGGEXEC)-$(EGGVERSION) $(EGGEXEC)) | |
| 86 | ||
| 87 | install-modules: | |
| 88 | - @if test -h $(DEST)/modules; then \ | |
| 89 | + @if test -h $(DESTDIR)/modules; then \ | |
| 90 | echo "Removing symlink to archival modules directory."; \ | |
| 91 | - rm -f $(DEST)/modules; \ | |
| 92 | + rm -f $(DESTDIR)/modules; \ | |
| 93 | fi | |
| 94 | - @if test -d $(DEST)/modules; then \ | |
| 95 | + @if test -d $(DESTDIR)/modules; then \ | |
| 96 | echo "Moving old modules into 'modules.old' directory."; \ | |
| 97 | - rm -rf $(DEST)/modules.old; \ | |
| 98 | - mv -f $(DEST)/modules $(DEST)/modules.old; \ | |
| 99 | + rm -rf $(DESTDIR)/modules.old; \ | |
| 100 | + mv -f $(DESTDIR)/modules $(DESTDIR)/modules.old; \ | |
| 101 | fi | |
| 102 | @if test ! "x`echo *.$(MOD_EXT)`" = "x*.$(MOD_EXT)"; then \ | |
| 103 | - if test ! -d $(DEST)/modules-$(EGGVERSION); then \ | |
| 104 | + if test ! -d $(DESTDIR)/modules-$(EGGVERSION); then \ | |
| 105 | echo "Creating modules-$(EGGVERSION) directory and symlink."; \ | |
| 106 | - $(top_srcdir)/misc/mkinstalldirs $(DEST)/modules-$(EGGVERSION); \ | |
| 107 | + $(top_srcdir)/misc/mkinstalldirs $(DESTDIR)/modules-$(EGGVERSION); \ | |
| 108 | fi; \ | |
| 109 | - (cd $(DEST) && $(LN_S) modules-$(EGGVERSION) modules); \ | |
| 110 | + (cd $(DESTDIR) && $(LN_S) modules-$(EGGVERSION) modules); \ | |
| 111 | echo "Copying new modules."; \ | |
| 112 | for i in *.$(MOD_EXT); do \ | |
| 113 | - $(INSTALL_PROGRAM) $$i $(DEST)/modules-$(EGGVERSION)/; \ | |
| 114 | + $(INSTALL_PROGRAM) $$i $(DESTDIR)/modules-$(EGGVERSION)/; \ | |
| 115 | done; \ | |
| 116 | fi | |
| 117 | ||
| 118 | install-data: | |
| be355aca | 119 | - @if test ! -f $(DEST)/eggdrop.conf; then \ |
| 120 | - $(INSTALL_DATA) $(srcdir)/eggdrop.conf $(DEST)/; \ | |
| 121 | + @if test ! -f $(DESTDIR)/eggdrop.conf; then \ | |
| 122 | + $(INSTALL_DATA) $(srcdir)/eggdrop.conf $(DESTDIR)/; \ | |
| 123 | fi | |
| 16c0d484 | 124 | - @if test ! -d $(DEST)/logs; then \ |
| 16c0d484 | 125 | + @if test ! -d $(DESTDIR)/logs; then \ |
| 126 | echo "Creating 'logs' subdirectory."; \ | |
| 127 | - $(top_srcdir)/misc/mkinstalldirs $(DEST)/logs; \ | |
| 128 | - $(INSTALL_DATA) $(srcdir)/logs/CONTENTS $(DEST)/logs/; \ | |
| 129 | + $(top_srcdir)/misc/mkinstalldirs $(DESTDIR)/logs; \ | |
| 130 | + $(INSTALL_DATA) $(srcdir)/logs/CONTENTS $(DESTDIR)/logs/; \ | |
| 131 | fi; | |
| 132 | - @if test ! -d $(DEST)/text; then \ | |
| 133 | + @if test ! -d $(DESTDIR)/text; then \ | |
| 134 | echo "Creating 'text' subdirectory."; \ | |
| 135 | - $(top_srcdir)/misc/mkinstalldirs $(DEST)/text; \ | |
| 136 | + $(top_srcdir)/misc/mkinstalldirs $(DESTDIR)/text; \ | |
| 137 | fi; | |
| 138 | - @if test ! -f $(DEST)/text/motd; then \ | |
| 139 | - $(INSTALL_DATA) $(srcdir)/text/motd $(DEST)/text/; \ | |
| 140 | + @if test ! -f $(DESTDIR)/text/motd; then \ | |
| 141 | + $(INSTALL_DATA) $(srcdir)/text/motd $(DESTDIR)/text/; \ | |
| 142 | fi | |
| 143 | - @if test ! -f $(DEST)/text/banner; then \ | |
| 144 | - $(INSTALL_DATA) $(srcdir)/text/banner $(DEST)/text/; \ | |
| 145 | + @if test ! -f $(DESTDIR)/text/banner; then \ | |
| 146 | + $(INSTALL_DATA) $(srcdir)/text/banner $(DESTDIR)/text/; \ | |
| 147 | fi | |
| 148 | ||
| 149 | install-help: | |
| 150 | @echo "Copying help files." | |
| 151 | @if test ! "x`echo $(srcdir)/help/*.help`" = "x$(srcdir)/help/*.help"; then \ | |
| 152 | - if test ! -d $(DEST)/help; then \ | |
| 153 | + if test ! -d $(DESTDIR)/help; then \ | |
| 154 | echo "Creating 'help' subdirectory."; \ | |
| 155 | - $(top_srcdir)/misc/mkinstalldirs $(DEST)/help; \ | |
| 156 | + $(top_srcdir)/misc/mkinstalldirs $(DESTDIR)/help; \ | |
| 157 | fi; \ | |
| 158 | for i in $(srcdir)/help/*.help; do \ | |
| 159 | - $(INSTALL_DATA) $$i $(DEST)/help/; \ | |
| 160 | + $(INSTALL_DATA) $$i $(DESTDIR)/help/; \ | |
| 161 | done; \ | |
| 162 | fi | |
| 163 | @if test ! "x`echo $(srcdir)/help/msg/*.help`" = "x$(srcdir)/help/msg/*.help"; then \ | |
| 164 | - if test ! -d $(DEST)/help/msg; then \ | |
| 165 | + if test ! -d $(DESTDIR)/help/msg; then \ | |
| 166 | echo "Creating 'help/msg' subdirectory."; \ | |
| 167 | - $(top_srcdir)/misc/mkinstalldirs $(DEST)/help/msg; \ | |
| 168 | + $(top_srcdir)/misc/mkinstalldirs $(DESTDIR)/help/msg; \ | |
| 169 | fi; \ | |
| 170 | for i in $(srcdir)/help/msg/*.help; do \ | |
| 171 | - $(INSTALL_DATA) $$i $(DEST)/help/msg/; \ | |
| 172 | + $(INSTALL_DATA) $$i $(DESTDIR)/help/msg/; \ | |
| 173 | done; \ | |
| 174 | fi | |
| 175 | @if test ! "x`echo $(srcdir)/help/set/*.help`" = "x$(srcdir)/help/set/*.help"; then \ | |
| 176 | - if test ! -d $(DEST)/help/set; then \ | |
| 177 | + if test ! -d $(DESTDIR)/help/set; then \ | |
| 178 | echo "Creating 'help/set' subdirectory."; \ | |
| 179 | - $(top_srcdir)/misc/mkinstalldirs $(DEST)/help/set; \ | |
| 180 | + $(top_srcdir)/misc/mkinstalldirs $(DESTDIR)/help/set; \ | |
| 181 | fi; \ | |
| 182 | for i in $(srcdir)/help/set/*.help; do \ | |
| 183 | - $(INSTALL_DATA) $$i $(DEST)/help/set/; \ | |
| 184 | + $(INSTALL_DATA) $$i $(DESTDIR)/help/set/; \ | |
| 185 | done; \ | |
| 186 | fi | |
| 187 | @cd src/mod/ && $(MAKE_INSTALL) install-help | |
| 188 | @@ -407,25 +407,25 @@ | |
| 189 | install-language: | |
| 190 | @echo "Copying language files." | |
| 191 | @if test ! "x`echo $(srcdir)/language/*.lang`" = "x$(srcdir)/language/*.lang"; then \ | |
| 192 | - if test ! -d $(DEST)/language; then \ | |
| 193 | + if test ! -d $(DESTDIR)/language; then \ | |
| 194 | echo "Creating 'language' subdirectory."; \ | |
| 195 | - $(top_srcdir)/misc/mkinstalldirs $(DEST)/language; \ | |
| 196 | + $(top_srcdir)/misc/mkinstalldirs $(DESTDIR)/language; \ | |
| 197 | fi; \ | |
| 198 | for i in $(srcdir)/language/*.lang; do \ | |
| 199 | - $(INSTALL_DATA) $$i $(DEST)/language/; \ | |
| 200 | + $(INSTALL_DATA) $$i $(DESTDIR)/language/; \ | |
| 201 | done; \ | |
| 202 | fi | |
| 203 | @cd src/mod && $(MAKE_INSTALL) install-language | |
| 204 | ||
| 205 | install-filesys: | |
| 206 | - @if test ! -d $(DEST)/filesys; then \ | |
| 207 | + @if test ! -d $(DESTDIR)/filesys; then \ | |
| 208 | echo "Creating a skeletal filesys subdirectory."; \ | |
| 209 | - $(top_srcdir)/misc/mkinstalldirs $(DEST)/filesys; \ | |
| 210 | - $(top_srcdir)/misc/mkinstalldirs $(DEST)/filesys/incoming; \ | |
| 211 | + $(top_srcdir)/misc/mkinstalldirs $(DESTDIR)/filesys; \ | |
| 212 | + $(top_srcdir)/misc/mkinstalldirs $(DESTDIR)/filesys/incoming; \ | |
| 213 | fi | |
| 214 | ||
| 215 | install-doc: | |
| 216 | - @$(INSTALL_DATA) $(srcdir)/README $(DEST) | |
| 217 | + @$(INSTALL_DATA) $(srcdir)/README $(DESTDIR) | |
| 218 | @cd doc/ && $(MAKE_INSTALL) install | |
| 219 | ||
| 220 | install-scripts: | |
| 221 | @@ -438,7 +438,7 @@ | |
| 222 | @echo "You MUST ensure that you edit/verify your configuration file." | |
| be355aca | 223 | @echo "An example configuration file, eggdrop.conf, is distributed with Eggdrop." |
| 16c0d484 | 224 | @echo "" |
| 225 | - @echo "Remember to change directory to $(DEST) before you proceed." | |
| 226 | + @echo "Remember to change directory to $(DESTDIR) before you proceed." | |
| 227 | @echo "" | |
| 228 | ||
| 229 | #safety hash | |
| 31bc0dcd AG |
230 | diff -urN eggdrop1.6.15/configure eggdrop1.6.15-FHS/configure |
| 231 | --- eggdrop1.6.15/configure Mon May 5 00:08:25 2003 | |
| 232 | +++ eggdrop1.6.15-FHS/configure Mon May 5 17:55:48 2003 | |
| 233 | @@ -7256,9 +7256,9 @@ | |
| 16c0d484 | 234 | #define EGG_VERSION $egg_version_num |
| 235 | _ACEOF | |
| 236 | ||
| 237 | -if test "${DEST-x}" = "x" | |
| 238 | +if test "${DESTDIR-x}" = "x" | |
| 239 | then | |
| 240 | - DEST=\${prefix} | |
| 241 | + DESTDIR=\${prefix} | |
| 242 | fi | |
| 243 | ||
| 244 | case "$srcdir" in | |
| 31bc0dcd | 245 | @@ -7922,7 +7922,7 @@ |
| 16c0d484 | 246 | s,@TCL_REQS@,$TCL_REQS,;t t |
| 247 | s,@TCL_LIBS@,$TCL_LIBS,;t t | |
| 248 | s,@EGGVERSION@,$EGGVERSION,;t t | |
| 249 | -s,@DEST@,$DEST,;t t | |
| 250 | +s,@DESTDIR@,$DESTDIR,;t t | |
| 251 | s,@MOD_UPDIR@,$MOD_UPDIR,;t t | |
| be355aca | 252 | s,@LIBOBJS@,$LIBOBJS,;t t |
| 253 | s,@LTLIBOBJS@,$LTLIBOBJS,;t t | |
| 31bc0dcd AG |
254 | diff -urN eggdrop1.6.15/doc/Makefile.in eggdrop1.6.15-FHS/doc/Makefile.in |
| 255 | --- eggdrop1.6.15/doc/Makefile.in Mon May 5 00:05:32 2003 | |
| 256 | +++ eggdrop1.6.15-FHS/doc/Makefile.in Mon May 5 17:55:48 2003 | |
| 16c0d484 | 257 | @@ -35,37 +35,37 @@ |
| 258 | @rm -f *~ | |
| 259 | ||
| 260 | install: | |
| 261 | - @if test ! -d $(DEST)/doc; then \ | |
| 262 | + @if test ! -d $(DESTDIR)/doc; then \ | |
| 263 | echo "Creating a doc subdirectory."; \ | |
| 264 | - $(top_srcdir)/misc/mkinstalldirs $(DEST)/doc; \ | |
| 265 | + $(top_srcdir)/misc/mkinstalldirs $(DESTDIR)/doc; \ | |
| 266 | fi | |
| 267 | - @if test ! -d $(DEST)/doc/man1; then \ | |
| 268 | - $(top_srcdir)/misc/mkinstalldirs $(DEST)/doc/man1; \ | |
| 269 | + @if test ! -d $(DESTDIR)/doc/man1; then \ | |
| 270 | + $(top_srcdir)/misc/mkinstalldirs $(DESTDIR)/doc/man1; \ | |
| 271 | fi | |
| 272 | - @if test ! -d $(DEST)/doc/html; then \ | |
| 273 | - $(top_srcdir)/misc/mkinstalldirs $(DEST)/doc/html; \ | |
| 274 | + @if test ! -d $(DESTDIR)/doc/html; then \ | |
| 275 | + $(top_srcdir)/misc/mkinstalldirs $(DESTDIR)/doc/html; \ | |
| 276 | fi | |
| 277 | - @if test ! -d $(DEST)/doc/settings; then \ | |
| 278 | - $(top_srcdir)/misc/mkinstalldirs $(DEST)/doc/settings; \ | |
| 279 | + @if test ! -d $(DESTDIR)/doc/settings; then \ | |
| 280 | + $(top_srcdir)/misc/mkinstalldirs $(DESTDIR)/doc/settings; \ | |
| 281 | fi | |
| 282 | @echo "Copying docs." | |
| 283 | @for i in $(DOCS); do \ | |
| 284 | - $(INSTALL_DATA) $(srcdir)/$$i $(DEST)/doc/; \ | |
| 285 | + $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)/doc/; \ | |
| 286 | done | |
| 287 | @for i in $(MAN1); do \ | |
| 288 | - $(INSTALL_DATA) $(srcdir)/$$i $(DEST)/doc/man1/; \ | |
| 289 | + $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)/doc/man1/; \ | |
| 290 | done | |
| 291 | @for i in $(SETTING_DOCS); do \ | |
| 292 | - $(INSTALL_DATA) $(srcdir)/settings/$$i $(DEST)/doc/settings/; \ | |
| 293 | + $(INSTALL_DATA) $(srcdir)/settings/$$i $(DESTDIR)/doc/settings/; \ | |
| 294 | done | |
| 295 | @if test "x`echo $(SETTING_MOD_DOCS)`" != "x$(SETTING_MOD_DOCS)"; then \ | |
| 296 | for i in `echo $(SETTING_MOD_DOCS)`; do \ | |
| 297 | - $(INSTALL_DATA) $$i $(DEST)/doc/settings/; \ | |
| 298 | + $(INSTALL_DATA) $$i $(DESTDIR)/doc/settings/; \ | |
| 299 | done; \ | |
| 300 | fi | |
| 301 | @if test "x`echo $(WEB_DOCS)`" != "x$(WEB_DOCS)"; then \ | |
| 302 | for i in `echo $(WEB_DOCS)`; do \ | |
| 303 | - $(INSTALL_DATA) $$i $(DEST)/doc/html/; \ | |
| 304 | + $(INSTALL_DATA) $$i $(DESTDIR)/doc/html/; \ | |
| 305 | done; \ | |
| 306 | fi | |
| 307 | ||
| 31bc0dcd AG |
308 | diff -urN eggdrop1.6.15/doc/html/faqs.html eggdrop1.6.15-FHS/doc/html/faqs.html |
| 309 | --- eggdrop1.6.15/doc/html/faqs.html Mon May 5 00:05:32 2003 | |
| 310 | +++ eggdrop1.6.15-FHS/doc/html/faqs.html Mon May 5 17:55:48 2003 | |
| be355aca | 311 | @@ -264,7 +264,7 @@ |
| 312 | ||
| 313 | <li> | |
| 314 | <p>If it's not your machine, you make have to resort to 'make | |
| 315 | - static' and 'make install DEST="path"' to make | |
| 316 | + static' and 'make install DESTDIR="path"' to make | |
| 317 | and install your bot.</p> | |
| 318 | </li> | |
| 319 | ||
| 31bc0dcd AG |
320 | diff -urN eggdrop1.6.15/doc/html/install.html eggdrop1.6.15-FHS/doc/html/install.html |
| 321 | --- eggdrop1.6.15/doc/html/install.html Mon May 5 00:05:32 2003 | |
| 322 | +++ eggdrop1.6.15-FHS/doc/html/install.html Mon May 5 17:55:48 2003 | |
| be355aca | 323 | @@ -96,13 +96,13 @@ |
| 324 | <p>If you want to install to a different directory, use:</p> | |
| 325 | ||
| 326 | <blockquote> | |
| 327 | - <p>make install DEST=<directory></p> | |
| 328 | + <p>make install DESTDIR=<directory></p> | |
| 329 | </blockquote> | |
| 330 | ||
| 331 | <p>For example:</p> | |
| 332 | ||
| 333 | <blockquote> | |
| 334 | - <p>make install DEST=/home/user/otherdir</p> | |
| 335 | + <p>make install DESTDIR=/home/user/otherdir</p> | |
| 336 | </blockquote> | |
| 337 | ||
| 338 | <p>Note that you must use full path for every file to be correctly | |
| 31bc0dcd AG |
339 | diff -urN eggdrop1.6.15/doc/html/readme.html eggdrop1.6.15-FHS/doc/html/readme.html |
| 340 | --- eggdrop1.6.15/doc/html/readme.html Mon May 5 00:05:32 2003 | |
| 341 | +++ eggdrop1.6.15-FHS/doc/html/readme.html Mon May 5 17:55:48 2003 | |
| be355aca | 342 | @@ -261,7 +261,7 @@ |
| 343 | <blockquote> | |
| 344 | <p>If you followed <a href="install.html">Compilation and | |
| 345 | Installation of Eggdrop</a> and did a 'make install' (or | |
| 346 | - 'make install DEST="path"') after 'make', | |
| 347 | + 'make install DESTDIR="path"') after 'make', | |
| 348 | this will be pretty easy. Just upload the new eggdrop1.6.x.tar.gz file | |
| 349 | to your home dir on your shell, gunzip and untar it, and type 'cd | |
| 350 | ~/eggdrop1.6.x'. Next, type './configure', 'make | |
| 31bc0dcd AG |
351 | diff -urN eggdrop1.6.15/doc/html/starting.html eggdrop1.6.15-FHS/doc/html/starting.html |
| 352 | --- eggdrop1.6.15/doc/html/starting.html Mon May 5 00:05:32 2003 | |
| 353 | +++ eggdrop1.6.15-FHS/doc/html/starting.html Mon May 5 17:55:48 2003 | |
| be355aca | 354 | @@ -91,7 +91,7 @@ |
| 355 | Eggdrop, you just have to do:</p> | |
| 356 | ||
| 357 | <blockquote> | |
| 358 | - <p><em>make DEST="directory" install</em></p> | |
| 359 | + <p><em>make DESTDIR="directory" install</em></p> | |
| 360 | </blockquote> | |
| 361 | ||
| 362 | <p>and it will copy all the necessary files.</p> | |
| 31bc0dcd AG |
363 | diff -urN eggdrop1.6.15/eggdrop.conf eggdrop1.6.15-FHS/eggdrop.conf |
| 364 | --- eggdrop1.6.15/eggdrop.conf Mon May 5 00:05:32 2003 | |
| 365 | +++ eggdrop1.6.15-FHS/eggdrop.conf Mon May 5 17:55:48 2003 | |
| be355aca | 366 | @@ -1,4 +1,4 @@ |
| 16c0d484 | 367 | -#! /path/to/executable/eggdrop |
| 16c0d484 | 368 | +#!/usr/bin/eggdrop |
| be355aca | 369 | # ^- This should contain a fully qualified path to your Eggdrop executable. |
| 16c0d484 | 370 | # |
| 371 | # $Id$ | |
| 31bc0dcd | 372 | @@ -187,22 +187,22 @@ |
| 16c0d484 | 373 | |
| be355aca | 374 | # Specify here where Eggdrop should look for help files. Don't modify this |
| 375 | # setting unless you know what you're doing! | |
| 16c0d484 | 376 | -set help-path "help/" |
| 377 | +set help-path "/usr/share/eggdrop/help/" | |
| 378 | ||
| be355aca | 379 | # Specify here where Eggdrop should look for text files. This is used for |
| 380 | # certain Tcl and DCC commands. | |
| 16c0d484 | 381 | -set text-path "text/" |
| be355aca | 382 | +set text-path "/usr/share/eggdrop" |
| 16c0d484 | 383 | |
| 384 | # Set here a place to store temporary files. | |
| 385 | set temp-path "/tmp" | |
| 386 | ||
| 387 | # The MOTD (Message Of The day) is displayed when people dcc chat or telnet | |
| 388 | # to the bot. Look at doc/text-substitutions.doc for options. | |
| 389 | -set motd "text/motd" | |
| 390 | +set motd "/usr/share/eggdrop/motd" | |
| 391 | ||
| be355aca | 392 | # This banner will be displayed on telnet connections. Look at |
| 393 | # doc/text-substitutions.doc for options. | |
| 16c0d484 | 394 | -set telnet-banner "text/banner" |
| 395 | +set telnet-banner "/usr/share/eggdrop/banner" | |
| 396 | ||
| be355aca | 397 | # This specifies what permissions the user, channel, and notes files should |
| 398 | # be set to. The octal values are the same as for the chmod system command. | |
| 31bc0dcd | 399 | @@ -422,7 +422,7 @@ |
| 16c0d484 | 400 | # If you run the bot from the compilation directory, you will want to set |
| 401 | # this to "". If you use 'make install' (like all good kiddies do ;), this | |
| 402 | # is a fine default. Otherwise, use your head :) | |
| 403 | -set mod-path "modules/" | |
| 404 | +set mod-path "/usr/lib/eggdrop/modules/" | |
| 405 | ||
| 406 | ||
| 407 | #### DNS MODULE #### | |
| 31bc0dcd | 408 | @@ -1320,17 +1320,17 @@ |
| 16c0d484 | 409 | # directory. All scripts should be put there, although you can place them where |
| 410 | # you like as long as you can supply a fully qualified path to them. | |
| 411 | # | |
| 412 | -# source scripts/script.tcl | |
| 413 | +# source /usr/share/eggdrop/scripts/script.tcl | |
| 414 | ||
| 415 | -source scripts/alltools.tcl | |
| 416 | -source scripts/action.fix.tcl | |
| 417 | +source /usr/share/eggdrop/scripts/alltools.tcl | |
| 418 | +source /usr/share/eggdrop/scripts/action.fix.tcl | |
| 419 | ||
| be355aca | 420 | # Use this script for Tcl and Eggdrop downwards compatibility. |
| 16c0d484 | 421 | # NOTE: This can also cause problems with some newer scripts. |
| 422 | -source scripts/compat.tcl | |
| 423 | +source /usr/share/eggdrop/scripts/compat.tcl | |
| 424 | ||
| 425 | # This script provides many useful informational functions, like setting | |
| 426 | # users' URLs, e-mail address, ICQ numbers, etc. You can modify it to add | |
| be355aca | 427 | # extra entries. |
| 16c0d484 | 428 | -source scripts/userinfo.tcl |
| 16c0d484 | 429 | +source /usr/share/eggdrop/scripts/userinfo.tcl |
| 430 | loadhelp userinfo.help | |
| 31bc0dcd AG |
431 | diff -urN eggdrop1.6.15/scripts/Makefile.in eggdrop1.6.15-FHS/scripts/Makefile.in |
| 432 | --- eggdrop1.6.15/scripts/Makefile.in Mon May 5 00:05:32 2003 | |
| 433 | +++ eggdrop1.6.15-FHS/scripts/Makefile.in Mon May 5 17:55:48 2003 | |
| 16c0d484 | 434 | @@ -31,44 +31,44 @@ |
| 435 | @rm -f *~ | |
| 436 | ||
| 437 | install: | |
| 438 | - @if test ! -d $(DEST)/scripts; then \ | |
| 439 | + @if test ! -d $(DESTDIR)/scripts; then \ | |
| 440 | echo "Creating a scripts subdirectory."; \ | |
| 441 | - $(top_srcdir)/misc/mkinstalldirs $(DEST)/scripts; \ | |
| 442 | + $(top_srcdir)/misc/mkinstalldirs $(DESTDIR)/scripts; \ | |
| 443 | echo "Copying scripts."; \ | |
| 444 | for i in $(DOCS); do \ | |
| 445 | - $(INSTALL_DATA) $(srcdir)/$$i $(DEST)/scripts/; \ | |
| 446 | + $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)/scripts/; \ | |
| 447 | done; \ | |
| 448 | for i in $(SCRIPTS); do \ | |
| 449 | - $(INSTALL_DATA) $(srcdir)/$$i $(DEST)/scripts/; \ | |
| 450 | + $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)/scripts/; \ | |
| 451 | done; \ | |
| 452 | for i in $(EXESCRIPTS); do \ | |
| 453 | - $(INSTALL_SCRIPT) $(srcdir)/$$i $(DEST)/scripts/; \ | |
| 454 | + $(INSTALL_SCRIPT) $(srcdir)/$$i $(DESTDIR)/scripts/; \ | |
| 455 | done; \ | |
| 456 | if test ! "x`echo $(srcdir)/help/*.help`" = "x$(srcdir)/help/*.help"; then \ | |
| 457 | - if test ! -d $(DEST)/help; then \ | |
| 458 | + if test ! -d $(DESTDIR)/help; then \ | |
| 459 | echo "Creating 'help' subdirectory."; \ | |
| 460 | - $(top_srcdir)/misc/mkinstalldirs $(DEST)/help; \ | |
| 461 | + $(top_srcdir)/misc/mkinstalldirs $(DESTDIR)/help; \ | |
| 462 | fi; \ | |
| 463 | for i in $(srcdir)/help/*.help; do \ | |
| 464 | - $(INSTALL_DATA) $$i $(DEST)/help/; \ | |
| 465 | + $(INSTALL_DATA) $$i $(DESTDIR)/help/; \ | |
| 466 | done; \ | |
| 467 | fi; \ | |
| 468 | if test ! "x`echo $(srcdir)/help/msg/*.help`" = "x$(srcdir)/help/msg/*.help"; then \ | |
| 469 | - if test ! -d $(DEST)/help/msg; then \ | |
| 470 | + if test ! -d $(DESTDIR)/help/msg; then \ | |
| 471 | echo "Creating 'help/msg' subdirectory."; \ | |
| 472 | - $(top_srcdir)/misc/mkinstalldirs $(DEST)/help/msg; \ | |
| 473 | + $(top_srcdir)/misc/mkinstalldirs $(DESTDIR)/help/msg; \ | |
| 474 | fi; \ | |
| 475 | for i in $(srcdir)/help/msg/*.help; do \ | |
| 476 | - $(INSTALL_DATA) $$i $(DEST)/help/msg/; \ | |
| 477 | + $(INSTALL_DATA) $$i $(DESTDIR)/help/msg/; \ | |
| 478 | done; \ | |
| 479 | fi; \ | |
| 480 | if test ! "x`echo $(srcdir)/help/set/*.help`" = "x$(srcdir)/help/set/*.help"; then \ | |
| 481 | - if test ! -d $(DEST)/help/set; then \ | |
| 482 | + if test ! -d $(DESTDIR)/help/set; then \ | |
| 483 | echo "Creating 'help/set' subdirectory."; \ | |
| 484 | - $(top_srcdir)/misc/mkinstalldirs $(DEST)/help/set; \ | |
| 485 | + $(top_srcdir)/misc/mkinstalldirs $(DESTDIR)/help/set; \ | |
| 486 | fi; \ | |
| 487 | for i in $(srcdir)/help/set/*.help; do \ | |
| 488 | - $(INSTALL_DATA) $$i $(DEST)/help/set/; \ | |
| 489 | + $(INSTALL_DATA) $$i $(DESTDIR)/help/set/; \ | |
| 490 | done; \ | |
| 491 | fi; \ | |
| 492 | fi | |
| 31bc0dcd AG |
493 | diff -urN eggdrop1.6.15/src/eggdrop.h eggdrop1.6.15-FHS/src/eggdrop.h |
| 494 | --- eggdrop1.6.15/src/eggdrop.h Mon May 5 00:05:32 2003 | |
| 495 | +++ eggdrop1.6.15-FHS/src/eggdrop.h Mon May 5 17:57:01 2003 | |
| 496 | @@ -85,7 +85,7 @@ | |
| be355aca | 497 | |
| be355aca | 498 | |
| 31bc0dcd AG |
499 | /* Language stuff */ |
| 500 | -#define LANGDIR "./language" /* language file directory */ | |
| 501 | +#define LANGDIR "/usr/share/eggdrop/language" /* language file directory */ | |
| 502 | #define BASELANG "english" /* language which always gets loaded before | |
| 503 | all other languages. You do not want to | |
| 504 | change this. */ | |
| 505 | diff -urN eggdrop1.6.15/src/mod/Makefile.in eggdrop1.6.15-FHS/src/mod/Makefile.in | |
| 506 | --- eggdrop1.6.15/src/mod/Makefile.in Mon May 5 00:05:32 2003 | |
| 507 | +++ eggdrop1.6.15-FHS/src/mod/Makefile.in Mon May 5 17:55:48 2003 | |
| 508 | @@ -122,50 +122,50 @@ | |
| 16c0d484 | 509 | |
| 510 | install-help: | |
| 511 | @echo "Copying module help files." | |
| 512 | - @if test ! -d $(DEST)/help; then \ | |
| 513 | + @if test ! -d $(DESTDIR)/help; then \ | |
| 514 | echo "Creating 'help' subdirectory."; \ | |
| 515 | - $(top_srcdir)/misc/mkinstalldirs $(DEST)/help; \ | |
| 516 | + $(top_srcdir)/misc/mkinstalldirs $(DESTDIR)/help; \ | |
| 517 | fi; \ | |
| 518 | for i in $(mods); do \ | |
| 519 | if test ! "x`echo $(srcdir)/$$i/help/*.help`" = "x$(srcdir)/$$i/help/*.help"; then \ | |
| 520 | for h in $(srcdir)/$$i/help/*.help; do \ | |
| 521 | - $(INSTALL_DATA) $$h $(DEST)/help/; \ | |
| 522 | + $(INSTALL_DATA) $$h $(DESTDIR)/help/; \ | |
| 523 | done; \ | |
| 524 | fi; \ | |
| 525 | done; | |
| 526 | - @if test ! -d $(DEST)/help/msg; then \ | |
| 527 | + @if test ! -d $(DESTDIR)/help/msg; then \ | |
| 528 | echo "Creating 'help/msg' subdirectory."; \ | |
| 529 | - $(top_srcdir)/misc/mkinstalldirs $(DEST)/help/msg; \ | |
| 530 | + $(top_srcdir)/misc/mkinstalldirs $(DESTDIR)/help/msg; \ | |
| 531 | fi; \ | |
| 532 | for i in $(mods); do \ | |
| 533 | if test ! "x`echo $(srcdir)/$$i/help/msg/*.help`" = "x$(srcdir)/$$i/help/msg/*.help"; then \ | |
| 534 | for h in $(srcdir)/$$i/help/msg/*.help; do \ | |
| 535 | - $(INSTALL_DATA) $$h $(DEST)/help/msg/; \ | |
| 536 | + $(INSTALL_DATA) $$h $(DESTDIR)/help/msg/; \ | |
| 537 | done; \ | |
| 538 | fi; \ | |
| 539 | done; | |
| 540 | - @if test ! -d $(DEST)/help/set; then \ | |
| 541 | + @if test ! -d $(DESTDIR)/help/set; then \ | |
| 542 | echo "Creating 'help/set' subdirectory."; \ | |
| 543 | - $(top_srcdir)/misc/mkinstalldirs $(DEST)/help/set; \ | |
| 544 | + $(top_srcdir)/misc/mkinstalldirs $(DESTDIR)/help/set; \ | |
| 545 | fi; \ | |
| 546 | for i in $(mods); do \ | |
| 547 | if test ! "x`echo $(srcdir)/$$i/help/set/*.help`" = "x$(srcdir)/$$i/help/set/*.help"; then \ | |
| 548 | for h in $(srcdir)/$$i/help/set/*.help; do \ | |
| 549 | - $(INSTALL_DATA) $$h $(DEST)/help/set/; \ | |
| 550 | + $(INSTALL_DATA) $$h $(DESTDIR)/help/set/; \ | |
| 551 | done; \ | |
| 552 | fi; \ | |
| 553 | done; | |
| 554 | ||
| 555 | install-language: | |
| 556 | @echo "Copying module language files." | |
| 557 | - @if test ! -d $(DEST)/language; then \ | |
| 558 | + @if test ! -d $(DESTDIR)/language; then \ | |
| 559 | echo "Creating 'language' subdirectory."; \ | |
| 560 | - $(top_srcdir)/misc/mkinstalldirs $(DEST)/language; \ | |
| 561 | + $(top_srcdir)/misc/mkinstalldirs $(DESTDIR)/language; \ | |
| 562 | fi; \ | |
| 563 | for i in $(mods); do \ | |
| 564 | if test ! "x`echo $(srcdir)/$$i/language/*.lang`" = "x$(srcdir)/$$i/language/*.lang"; then \ | |
| 565 | for h in $(srcdir)/$$i/language/*.lang; do \ | |
| 566 | - $(INSTALL_DATA) $$h $(DEST)/language/; \ | |
| 567 | + $(INSTALL_DATA) $$h $(DESTDIR)/language/; \ | |
| 568 | done; \ | |
| 569 | fi; \ | |
| 570 | done; |