eggdrop-FHS.patch

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