eggdrop-FHS.patch

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