diff -burNp eggdrop1.6.19/configure eggdrop1.6.19.new/configure --- eggdrop1.6.19/configure 2008-04-19 06:21:20.000000000 +0200 +++ eggdrop1.6.19.new/configure 2008-09-22 09:29:38.000000000 +0200 @@ -315,7 +315,8 @@ ac_includes_default="\ # include #endif" -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' +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' + ac_subst_files='' # Initialize some variables set by options. @@ -10129,8 +10130,8 @@ _ACEOF - if test "${DEST-x}" = "x"; then - DEST=\${prefix} + if test "${DESTDIR-x}" = "x"; then + DESTDIR=\${prefix} fi @@ -10828,7 +10829,7 @@ s,@TCLINCFN@,$TCLINCFN,;t t s,@TCL_REQS@,$TCL_REQS,;t t s,@TCL_LIBS@,$TCL_LIBS,;t t s,@EGGVERSION@,$EGGVERSION,;t t -s,@DEST@,$DEST,;t t +s,@DESTDIR@,$DESTDIR,;t t s,@MOD_UPDIR@,$MOD_UPDIR,;t t s,@LIBOBJS@,$LIBOBJS,;t t s,@LTLIBOBJS@,$LTLIBOBJS,;t t diff -burNp eggdrop1.6.19/doc/html/compiling.html eggdrop1.6.19.new/doc/html/compiling.html --- eggdrop1.6.19/doc/html/compiling.html 2008-02-16 22:40:58.000000000 +0100 +++ eggdrop1.6.19.new/doc/html/compiling.html 2008-09-22 09:32:52.000000000 +0200 @@ -147,7 +147,7 @@ 
-make install DEST=<directory>
+make install DESTDIR=<directory>
@@ -155,7 +155,7 @@ make install DEST=<directory> 
-make install DEST=/home/user/otherdir
+make install DESTDIR=/home/user/otherdir
@@ -255,7 +255,7 @@ sh5 ./configure --with-tclinc='<f 
-gmake install DEST='directory'
+gmake install DESTDIR='directory'
@@ -263,7 +263,7 @@ gmake install DEST='directory' 
-gmake install DEST=/home/user/otherdir
+gmake install DESTDIR=/home/user/otherdir
@@ -389,14 +389,14 @@ tar -zxf eggdrop1.6.19.tar.gz
  • Compile the bot using 'make eggdrop'.

    • -
  • Install the bot by typing 'make install DEST=<install +
  • Install the bot by typing 'make install DESTDIR=<install path>'.

    For example: 
    -make install DEST='C:/eggdrop/'
+make install DESTDIR='C:/eggdrop/'
    diff -burNp eggdrop1.6.19/doc/html/faqs.html eggdrop1.6.19.new/doc/html/faqs.html --- eggdrop1.6.19/doc/html/faqs.html 2008-02-16 22:40:58.000000000 +0100 +++ eggdrop1.6.19.new/doc/html/faqs.html 2008-09-22 09:36:32.000000000 +0200 @@ -254,7 +254,7 @@

  • If it's not your machine, you may have to resort to 'make - static' and 'make install DEST="path"' to make + static' and 'make install DESTDIR="path"' to make and install your bot.

    • diff -burNp eggdrop1.6.19/doc/html/install.html eggdrop1.6.19.new/doc/html/install.html --- eggdrop1.6.19/doc/html/install.html 2008-02-16 22:40:58.000000000 +0100 +++ eggdrop1.6.19.new/doc/html/install.html 2008-09-22 09:39:15.000000000 +0200 @@ -100,13 +100,13 @@

    If you want to install to a different directory, use:

    -

    make install DEST=<directory>

    +

    make install DESTDIR=<directory>

    For example:

    -

    make install DEST=/home/user/otherdir

    +

    make install DESTDIR=/home/user/otherdir

    Note that you must use full path for every file to be correctly diff -burNp eggdrop1.6.19/doc/html/readme.html eggdrop1.6.19.new/doc/html/readme.html --- eggdrop1.6.19/doc/html/readme.html 2008-02-16 22:40:59.000000000 +0100 +++ eggdrop1.6.19.new/doc/html/readme.html 2008-09-22 09:39:49.000000000 +0200 @@ -261,7 +261,7 @@

    If you followed Compilation and Installation of Eggdrop and did a 'make install' (or - 'make install DEST="path"') after 'make', + 'make install DESTDIR="path"') after 'make', this will be pretty easy. Just upload the new eggdrop1.6.x.tar.gz file to your home dir on your shell, gunzip and untar it, and type 'cd ~/eggdrop1.6.x'. Next, type './configure', 'make diff -burNp eggdrop1.6.19/doc/html/starting.html eggdrop1.6.19.new/doc/html/starting.html --- eggdrop1.6.19/doc/html/starting.html 2008-02-16 22:40:59.000000000 +0100 +++ eggdrop1.6.19.new/doc/html/starting.html 2008-09-22 09:42:21.000000000 +0200 @@ -97,7 +97,7 @@ Eggdrop, you just have to do:

    -

    make DEST="directory" install

    +

    make DESTDIR="directory" install

    and it will copy all the necessary files.

    diff -burNp eggdrop1.6.19/doc/Makefile.in eggdrop1.6.19.new/doc/Makefile.in --- eggdrop1.6.19/doc/Makefile.in 2004-08-08 20:17:00.000000000 +0200 +++ eggdrop1.6.19.new/doc/Makefile.in 2008-09-22 09:45:18.000000000 +0200 @@ -34,39 +34,39 @@ clean: @rm -f *~ install: - @if test ! -d $(DEST)/doc; then \ + @if test ! -d $(DESTDIR)/doc; then \ echo "Creating 'doc' subdirectory."; \ - $(top_srcdir)/misc/mkinstalldirs $(DEST)/doc >/dev/null; \ + $(top_srcdir)/misc/mkinstalldirs $(DESTDIR)/doc >/dev/null; \ fi - @if test ! -d $(DEST)/doc/man1; then \ + @if test ! -d $(DESTDIR)/doc/man1; then \ echo "Creating 'doc/man1' subdirectory."; \ - $(top_srcdir)/misc/mkinstalldirs $(DEST)/doc/man1 >/dev/null; \ + $(top_srcdir)/misc/mkinstalldirs $(DESTDIR)/doc/man1 >/dev/null; \ fi - @if test ! -d $(DEST)/doc/html; then \ + @if test ! -d $(DESTDIR)/doc/html; then \ echo "Creating 'doc/html' subdirectory."; \ - $(top_srcdir)/misc/mkinstalldirs $(DEST)/doc/html >/dev/null; \ + $(top_srcdir)/misc/mkinstalldirs $(DESTDIR)/doc/html >/dev/null; \ fi - @if test ! -d $(DEST)/doc/settings; then \ + @if test ! -d $(DESTDIR)/doc/settings; then \ echo "Creating 'doc/settings' subdirectory."; \ - $(top_srcdir)/misc/mkinstalldirs $(DEST)/doc/settings >/dev/null; \ + $(top_srcdir)/misc/mkinstalldirs $(DESTDIR)/doc/settings >/dev/null; \ fi @echo "Copying docs." @for i in $(DOCS); do \ - $(INSTALL_DATA) $(srcdir)/$$i $(DEST)/doc/; \ + $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)/doc/; \ done @for i in $(MAN1); do \ - $(INSTALL_DATA) $(srcdir)/$$i $(DEST)/doc/man1/; \ + $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)/doc/man1/; \ done @for i in $(SETTING_DOCS); do \ - $(INSTALL_DATA) $(srcdir)/settings/$$i $(DEST)/doc/settings/; \ + $(INSTALL_DATA) $(srcdir)/settings/$$i $(DESTDIR)/doc/settings/; \ done @if test "x`echo $(SETTING_MOD_DOCS)`" != "x$(SETTING_MOD_DOCS)"; then \ for i in `echo $(SETTING_MOD_DOCS)`; do \ - $(INSTALL_DATA) $$i $(DEST)/doc/settings/; \ + $(INSTALL_DATA) $$i $(DESTDIR)/doc/settings/; \ done; \ fi @if test "x`echo $(WEB_DOCS)`" != "x$(WEB_DOCS)"; then \ for i in `echo $(WEB_DOCS)`; do \ - $(INSTALL_DATA) $$i $(DEST)/doc/html/; \ + $(INSTALL_DATA) $$i $(DESTDIR)/doc/html/; \ done; \ fi diff -burNp eggdrop1.6.19/eggdrop.conf eggdrop1.6.19.new/eggdrop.conf --- eggdrop1.6.19/eggdrop.conf 2008-02-16 21:15:30.000000000 +0100 +++ eggdrop1.6.19.new/eggdrop.conf 2008-09-22 09:52:43.000000000 +0200 @@ -1,4 +1,4 @@ -#! /path/to/executable/eggdrop +#! /usr/bin/eggdrop # ^- This should contain a fully qualified path to your Eggdrop executable. # # $Id$ @@ -185,22 +185,22 @@ set sort-users 0 # Specify here where Eggdrop should look for help files. Don't modify this # setting unless you know what you're doing! -set help-path "help/" +set help-path "/usr/share/eggdrop/help/" # Specify here where Eggdrop should look for text files. This is used for # certain Tcl and DCC commands. -set text-path "text/" +set text-path "/usr/share/eggdrop/" # Set here a place to store temporary files. set temp-path "/tmp" # The MOTD (Message Of The day) is displayed when people dcc chat or telnet # to the bot. Look at doc/TEXT-SUBSTITUTIONS for options. -set motd "text/motd" +set motd "/usr/share/eggdrop/motd" # This banner will be displayed on telnet connections. Look at # doc/TEXT-SUBSTITUTIONS for options. -set telnet-banner "text/banner" +set telnet-banner "/usr/share/eggdrop/banner" # This specifies what permissions the user, channel, and notes files should # be set to. The octal values are the same as for the chmod system command. @@ -419,7 +419,7 @@ die "Please make sure you edit your conf # If you run the bot from the compilation directory, you will want to set # this to "". If you use 'make install' (like all good kiddies do ;), this # is a fine default. Otherwise, use your head :) -set mod-path "modules/" +set mod-path "/usr/lib/eggdrop/modules/" #### BLOWFISH MODULE #### @@ -1334,19 +1334,19 @@ loadmodule uptime # directory. All scripts should be put there, although you can place them where # you like as long as you can supply a fully qualified path to them. # -# source scripts/script.tcl +# /usr/share/eggdrop/scripts/script.tcl -source scripts/alltools.tcl -source scripts/action.fix.tcl +source /usr/share/eggdrop/scripts/alltools.tcl +source /usr/share/eggdrop/scripts/action.fix.tcl # Use this script for Tcl and Eggdrop backwards compatibility. # NOTE: This can also cause problems with some newer scripts. -#source scripts/compat.tcl +source /usr/share/eggdrop/scripts/compat.tcl # This script provides many useful informational functions, like setting # users' URLs, e-mail address, ICQ numbers, etc. You can modify it to add # extra entries. -source scripts/userinfo.tcl +source /usr/share/eggdrop/scripts/userinfo.tcl loadhelp userinfo.help # A few IRC networks (EFnet and Undernet) have added some simple checks to diff -burNp eggdrop1.6.19/INSTALL eggdrop1.6.19.new/INSTALL --- eggdrop1.6.19/INSTALL 2008-02-16 22:40:54.000000000 +0100 +++ eggdrop1.6.19.new/INSTALL 2008-09-22 09:53:40.000000000 +0200 @@ -66,11 +66,11 @@ Last revised: July 24, 2004 If you want to install to a different directory, use: - make install DEST= + make install DESTDIR= For example: - make install DEST=/home/user/otherdir + make install DESTDIR=/home/user/otherdir Note that you must use full path for every file to be correctly installed. diff -burNp eggdrop1.6.19/Makefile.in eggdrop1.6.19.new/Makefile.in --- eggdrop1.6.19/Makefile.in 2004-08-28 08:43:21.000000000 +0200 +++ eggdrop1.6.19.new/Makefile.in 2008-09-22 09:56:26.000000000 +0200 @@ -11,7 +11,7 @@ VPATH = @srcdir@ @SET_MAKE@ prefix = @prefix@ -DEST = @DEST@ +DESTDIR = @DESTDIR@ EGGEXEC = @EGGEXEC@ EGGVERSION = @EGGVERSION@ @@ -119,7 +119,7 @@ MAKE_DEPEND = $(MAKE) 'MAKE=$(MAKE)' 'CC MAKE_CONFIG = $(MAKE) 'MAKE=$(MAKE)' -MAKE_INSTALL = $(MAKE) 'MAKE=$(MAKE)' 'DEST=$(DEST)' +MAKE_INSTALL = $(MAKE) 'MAKE=$(MAKE)' 'DESTDIR=$(DESTDIR)' all: @DEFAULT_MAKE@ @@ -308,109 +308,109 @@ install-start: echo ""; \ exit 1; \ fi - @if test "x$(DEST)" = "x"; then \ + @if test "x$(DESTDIR)" = "x"; then \ echo "You must specify a destination directory."; \ echo "Example:"; \ echo ""; \ - echo " make install DEST=\"/home/wcc/mybot\""; \ + echo " make install DESTDIR=\"/home/wcc/mybot\""; \ echo ""; \ exit 1; \ fi @echo "" @$(egg_test_run) @echo "" - @echo "Installing in directory: '$(DEST)'." + @echo "Installing in directory: '$(DESTDIR)'." @echo "" - @if test ! -d $(DEST); then \ - echo "Creating directory '$(DEST)'."; \ - $(top_srcdir)/misc/mkinstalldirs $(DEST) >/dev/null; \ + @if test ! -d $(DESTDIR); then \ + echo "Creating directory '$(DESTDIR)'."; \ + $(top_srcdir)/misc/mkinstalldirs $(DESTDIR) >/dev/null; \ fi install-bin: - @if test -f $(DEST)/o$(EGGEXEC); then \ - rm -f $(DEST)/o$(EGGEXEC); \ + @if test -f $(DESTDIR)/o$(EGGEXEC); then \ + rm -f $(DESTDIR)/o$(EGGEXEC); \ fi - @if test -h $(DEST)/$(EGGEXEC); then \ + @if test -h $(DESTDIR)/$(EGGEXEC); then \ echo "Removing symlink to archival eggdrop binary."; \ - rm -f $(DEST)/$(EGGEXEC); \ + rm -f $(DESTDIR)/$(EGGEXEC); \ fi - @if test -f $(DEST)/$(EGGEXEC); then \ + @if test -f $(DESTDIR)/$(EGGEXEC); then \ echo "Renaming old '$(EGGEXEC)' executable to 'o$(EGGEXEC)'."; \ - mv -f $(DEST)/$(EGGEXEC) $(DEST)/o$(EGGEXEC); \ + mv -f $(DESTDIR)/$(EGGEXEC) $(DESTDIR)/o$(EGGEXEC); \ fi @echo "Copying new '$(EGGEXEC)' executable and creating symlink." - @$(INSTALL_PROGRAM) $(EGGEXEC) $(DEST)/$(EGGEXEC)-$(EGGVERSION) - @(cd $(DEST) && $(LN_S) $(EGGEXEC)-$(EGGVERSION) $(EGGEXEC)) + @$(INSTALL_PROGRAM) $(EGGEXEC) $(DESTDIR)/$(EGGEXEC)-$(EGGVERSION) + @(cd $(DESTDIR) && $(LN_S) $(EGGEXEC)-$(EGGVERSION) $(EGGEXEC)) install-modules: - @if test -h $(DEST)/modules; then \ + @if test -h $(DESTDIR)/modules; then \ echo "Removing symlink to archival modules subdirectory."; \ - rm -f $(DEST)/modules; \ + rm -f $(DESTDIR)/modules; \ fi - @if test -d $(DEST)/modules; then \ + @if test -d $(DESTDIR)/modules; then \ echo "Moving old modules into 'modules.old' subdirectory."; \ - rm -rf $(DEST)/modules.old; \ - mv -f $(DEST)/modules $(DEST)/modules.old; \ + rm -rf $(DESTDIR)/modules.old; \ + mv -f $(DESTDIR)/modules $(DESTDIR)/modules.old; \ fi @if test ! "x`echo *.$(MOD_EXT)`" = "x*.$(MOD_EXT)"; then \ - if test ! -d $(DEST)/modules-$(EGGVERSION); then \ + if test ! -d $(DESTDIR)/modules-$(EGGVERSION); then \ echo "Creating 'modules-$(EGGVERSION)' subdirectory and symlink."; \ - $(top_srcdir)/misc/mkinstalldirs $(DEST)/modules-$(EGGVERSION) >/dev/null; \ + $(top_srcdir)/misc/mkinstalldirs $(DESTDIR)/modules-$(EGGVERSION) >/dev/null; \ fi; \ - (cd $(DEST) && $(LN_S) modules-$(EGGVERSION) modules); \ + (cd $(DESTDIR) && $(LN_S) modules-$(EGGVERSION) modules); \ echo "Copying new modules."; \ for i in *.$(MOD_EXT); do \ - $(INSTALL_PROGRAM) $$i $(DEST)/modules-$(EGGVERSION)/; \ + $(INSTALL_PROGRAM) $$i $(DESTDIR)/modules-$(EGGVERSION)/; \ done; \ fi install-data: - @if test ! -f $(DEST)/eggdrop.conf; then \ - $(INSTALL_DATA) $(srcdir)/eggdrop.conf $(DEST)/; \ + @if test ! -f $(DESTDIR)/eggdrop.conf; then \ + $(INSTALL_DATA) $(srcdir)/eggdrop.conf $(DESTDIR)/; \ fi - @if test ! -d $(DEST)/logs; then \ + @if test ! -d $(DESTDIR)/logs; then \ echo "Creating 'logs' subdirectory."; \ - $(top_srcdir)/misc/mkinstalldirs $(DEST)/logs >/dev/null; \ - $(INSTALL_DATA) $(srcdir)/logs/CONTENTS $(DEST)/logs/; \ + $(top_srcdir)/misc/mkinstalldirs $(DESTDIR)/logs >/dev/null; \ + $(INSTALL_DATA) $(srcdir)/logs/CONTENTS $(DESTDIR)/logs/; \ fi; - @if test ! -d $(DEST)/text; then \ + @if test ! -d $(DESTDIR)/text; then \ echo "Creating 'text' subdirectory."; \ - $(top_srcdir)/misc/mkinstalldirs $(DEST)/text >/dev/null; \ + $(top_srcdir)/misc/mkinstalldirs $(DESTDIR)/text >/dev/null; \ fi; - @if test ! -f $(DEST)/text/motd; then \ - $(INSTALL_DATA) $(srcdir)/text/motd $(DEST)/text/; \ + @if test ! -f $(DESTDIR)/text/motd; then \ + $(INSTALL_DATA) $(srcdir)/text/motd $(DESTDIR)/text/; \ fi - @if test ! -f $(DEST)/text/banner; then \ - $(INSTALL_DATA) $(srcdir)/text/banner $(DEST)/text/; \ + @if test ! -f $(DESTDIR)/text/banner; then \ + $(INSTALL_DATA) $(srcdir)/text/banner $(DESTDIR)/text/; \ fi install-help: @echo "Copying help files." @if test ! "x`echo $(srcdir)/help/*.help`" = "x$(srcdir)/help/*.help"; then \ - if test ! -d $(DEST)/help; then \ + if test ! -d $(DESTDIR)/help; then \ echo "Creating 'help' subdirectory."; \ - $(top_srcdir)/misc/mkinstalldirs $(DEST)/help >/dev/null; \ + $(top_srcdir)/misc/mkinstalldirs $(DESTDIR)/help >/dev/null; \ fi; \ for i in $(srcdir)/help/*.help; do \ - $(INSTALL_DATA) $$i $(DEST)/help/; \ + $(INSTALL_DATA) $$i $(DESTDIR)/help/; \ done; \ fi @if test ! "x`echo $(srcdir)/help/msg/*.help`" = "x$(srcdir)/help/msg/*.help"; then \ - if test ! -d $(DEST)/help/msg; then \ + if test ! -d $(DESTDIR)/help/msg; then \ echo "Creating 'help/msg' subdirectory."; \ - $(top_srcdir)/misc/mkinstalldirs $(DEST)/help/msg >/dev/null; \ + $(top_srcdir)/misc/mkinstalldirs $(DESTDIR)/help/msg >/dev/null; \ fi; \ for i in $(srcdir)/help/msg/*.help; do \ - $(INSTALL_DATA) $$i $(DEST)/help/msg/; \ + $(INSTALL_DATA) $$i $(DESTDIR)/help/msg/; \ done; \ fi @if test ! "x`echo $(srcdir)/help/set/*.help`" = "x$(srcdir)/help/set/*.help"; then \ - if test ! -d $(DEST)/help/set; then \ + if test ! -d $(DESTDIR)/help/set; then \ echo "Creating 'help/set' subdirectory."; \ - $(top_srcdir)/misc/mkinstalldirs $(DEST)/help/set >/dev/null; \ + $(top_srcdir)/misc/mkinstalldirs $(DESTDIR)/help/set >/dev/null; \ fi; \ for i in $(srcdir)/help/set/*.help; do \ - $(INSTALL_DATA) $$i $(DEST)/help/set/; \ + $(INSTALL_DATA) $$i $(DESTDIR)/help/set/; \ done; \ fi @cd src/mod/ && $(MAKE_INSTALL) install-help @@ -418,25 +418,25 @@ install-help: install-language: @echo "Copying language files." @if test ! "x`echo $(srcdir)/language/*.lang`" = "x$(srcdir)/language/*.lang"; then \ - if test ! -d $(DEST)/language; then \ + if test ! -d $(DESTDIR)/language; then \ echo "Creating 'language' subdirectory."; \ - $(top_srcdir)/misc/mkinstalldirs $(DEST)/language >/dev/null; \ + $(top_srcdir)/misc/mkinstalldirs $(DESTDIR)/language >/dev/null; \ fi; \ for i in $(srcdir)/language/*.lang; do \ - $(INSTALL_DATA) $$i $(DEST)/language/; \ + $(INSTALL_DATA) $$i $(DESTDIR)/language/; \ done; \ fi @cd src/mod && $(MAKE_INSTALL) install-language install-filesys: - @if test ! -d $(DEST)/filesys; then \ + @if test ! -d $(DESTDIR)/filesys; then \ echo "Creating skeletal filesystem subdirectories."; \ - $(top_srcdir)/misc/mkinstalldirs $(DEST)/filesys >/dev/null; \ - $(top_srcdir)/misc/mkinstalldirs $(DEST)/filesys/incoming >/dev/null; \ + $(top_srcdir)/misc/mkinstalldirs $(DESTDIR)/filesys >/dev/null; \ + $(top_srcdir)/misc/mkinstalldirs $(DESTDIR)/filesys/incoming >/dev/null; \ fi install-doc: - @$(INSTALL_DATA) $(srcdir)/README $(DEST) + @$(INSTALL_DATA) $(srcdir)/README $(DESTDIR) @cd doc/ && $(MAKE_INSTALL) install install-scripts: @@ -449,7 +449,7 @@ install-end: @echo "You MUST ensure that you edit/verify your configuration file." @echo "An example configuration file, eggdrop.conf, is distributed with Eggdrop." @echo "" - @echo "Remember to change directory to $(DEST) before you proceed." + @echo "Remember to change directory to $(DESTDIR) before you proceed." @echo "" #safety hash diff -burNp eggdrop1.6.19/scripts/Makefile.in eggdrop1.6.19.new/scripts/Makefile.in --- eggdrop1.6.19/scripts/Makefile.in 2008-02-16 07:00:17.000000000 +0100 +++ eggdrop1.6.19.new/scripts/Makefile.in 2008-09-22 09:58:28.000000000 +0200 @@ -32,44 +32,44 @@ clean: @rm -f *~ install: - @if test ! -d $(DEST)/scripts; then \ + @if test ! -d $(DESTDIR)/scripts; then \ echo "Creating 'scripts' subdirectory."; \ - $(top_srcdir)/misc/mkinstalldirs $(DEST)/scripts >/dev/null; \ + $(top_srcdir)/misc/mkinstalldirs $(DESTDIR)/scripts >/dev/null; \ echo "Copying scripts."; \ for i in $(DOCS); do \ - $(INSTALL_DATA) $(srcdir)/$$i $(DEST)/scripts/; \ + $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)/scripts/; \ done; \ for i in $(SCRIPTS); do \ - $(INSTALL_DATA) $(srcdir)/$$i $(DEST)/scripts/; \ + $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)/scripts/; \ done; \ for i in $(EXESCRIPTS); do \ - $(INSTALL_SCRIPT) $(srcdir)/$$i $(DEST)/scripts/; \ + $(INSTALL_SCRIPT) $(srcdir)/$$i $(DESTDIR)/scripts/; \ done; \ if test ! "x`echo $(srcdir)/help/*.help`" = "x$(srcdir)/help/*.help"; then \ - if test ! -d $(DEST)/help; then \ + if test ! -d $(DESTDIR)/help; then \ echo "Creating 'help' subdirectory."; \ - $(top_srcdir)/misc/mkinstalldirs $(DEST)/help >/dev/null; \ + $(top_srcdir)/misc/mkinstalldirs $(DESTDIR)/help >/dev/null; \ fi; \ for i in $(srcdir)/help/*.help; do \ - $(INSTALL_DATA) $$i $(DEST)/help/; \ + $(INSTALL_DATA) $$i $(DESTDIR)/help/; \ done; \ fi; \ if test ! "x`echo $(srcdir)/help/msg/*.help`" = "x$(srcdir)/help/msg/*.help"; then \ - if test ! -d $(DEST)/help/msg; then \ + if test ! -d $(DESTDIR)/help/msg; then \ echo "Creating 'help/msg' subdirectory."; \ - $(top_srcdir)/misc/mkinstalldirs $(DEST)/help/msg >/dev/null; \ + $(top_srcdir)/misc/mkinstalldirs $(DESTDIR)/help/msg >/dev/null; \ fi; \ for i in $(srcdir)/help/msg/*.help; do \ - $(INSTALL_DATA) $$i $(DEST)/help/msg/; \ + $(INSTALL_DATA) $$i $(DESTDIR)/help/msg/; \ done; \ fi; \ if test ! "x`echo $(srcdir)/help/set/*.help`" = "x$(srcdir)/help/set/*.help"; then \ - if test ! -d $(DEST)/help/set; then \ + if test ! -d $(DESTDIR)/help/set; then \ echo "Creating 'help/set' subdirectory."; \ - $(top_srcdir)/misc/mkinstalldirs $(DEST)/help/set >/dev/null; \ + $(top_srcdir)/misc/mkinstalldirs $(DESTDIR)/help/set >/dev/null; \ fi; \ for i in $(srcdir)/help/set/*.help; do \ - $(INSTALL_DATA) $$i $(DEST)/help/set/; \ + $(INSTALL_DATA) $$i $(DESTDIR)/help/set/; \ done; \ fi; \ fi diff -burNp eggdrop1.6.19/src/eggdrop.h eggdrop1.6.19.new/src/eggdrop.h --- eggdrop1.6.19/src/eggdrop.h 2008-02-16 22:41:03.000000000 +0100 +++ eggdrop1.6.19.new/src/eggdrop.h 2008-09-22 10:00:48.000000000 +0200 @@ -75,7 +75,7 @@ /* Language stuff */ -#define LANGDIR "./language" /* language file directory */ +#define LANGDIR "/usr/share/eggdrop/language" /* language file directory */ #define BASELANG "english" /* language which always gets loaded before all other languages. You do not want to change this. */ diff -burNp eggdrop1.6.19/src/mod/Makefile.in eggdrop1.6.19.new/src/mod/Makefile.in --- eggdrop1.6.19/src/mod/Makefile.in 2004-08-28 08:43:22.000000000 +0200 +++ eggdrop1.6.19.new/src/mod/Makefile.in 2008-09-22 10:02:45.000000000 +0200 @@ -123,50 +123,50 @@ install: install-help install-language install-help: @echo "Copying module help files." - @if test ! -d $(DEST)/help; then \ + @if test ! -d $(DESTDIR)/help; then \ echo "Creating 'help' subdirectory."; \ - $(top_srcdir)/misc/mkinstalldirs $(DEST)/help >/dev/null; \ + $(top_srcdir)/misc/mkinstalldirs $(DESTDIR)/help >/dev/null; \ fi; \ for i in $(mods); do \ if test ! "x`echo $(srcdir)/$$i/help/*.help`" = "x$(srcdir)/$$i/help/*.help"; then \ for h in $(srcdir)/$$i/help/*.help; do \ - $(INSTALL_DATA) $$h $(DEST)/help/; \ + $(INSTALL_DATA) $$h $(DESTDIR)/help/; \ done; \ fi; \ done; - @if test ! -d $(DEST)/help/msg; then \ + @if test ! -d $(DESTDIR)/help/msg; then \ echo "Creating 'help/msg' subdirectory."; \ - $(top_srcdir)/misc/mkinstalldirs $(DEST)/help/msg >/dev/null; \ + $(top_srcdir)/misc/mkinstalldirs $(DESTDIR)/help/msg >/dev/null; \ fi; \ for i in $(mods); do \ if test ! "x`echo $(srcdir)/$$i/help/msg/*.help`" = "x$(srcdir)/$$i/help/msg/*.help"; then \ for h in $(srcdir)/$$i/help/msg/*.help; do \ - $(INSTALL_DATA) $$h $(DEST)/help/msg/; \ + $(INSTALL_DATA) $$h $(DESTDIR)/help/msg/; \ done; \ fi; \ done; - @if test ! -d $(DEST)/help/set; then \ + @if test ! -d $(DESTDIR)/help/set; then \ echo "Creating 'help/set' subdirectory."; \ - $(top_srcdir)/misc/mkinstalldirs $(DEST)/help/set >/dev/null; \ + $(top_srcdir)/misc/mkinstalldirs $(DESTDIR)/help/set >/dev/null; \ fi; \ for i in $(mods); do \ if test ! "x`echo $(srcdir)/$$i/help/set/*.help`" = "x$(srcdir)/$$i/help/set/*.help"; then \ for h in $(srcdir)/$$i/help/set/*.help; do \ - $(INSTALL_DATA) $$h $(DEST)/help/set/; \ + $(INSTALL_DATA) $$h $(DESTDIR)/help/set/; \ done; \ fi; \ done; install-language: @echo "Copying module language files." - @if test ! -d $(DEST)/language; then \ + @if test ! -d $(DESTDIR)/language; then \ echo "Creating 'language' subdirectory."; \ - $(top_srcdir)/misc/mkinstalldirs $(DEST)/language >/dev/null; \ + $(top_srcdir)/misc/mkinstalldirs $(DESTDIR)/language >/dev/null; \ fi; \ for i in $(mods); do \ if test ! "x`echo $(srcdir)/$$i/language/*.lang`" = "x$(srcdir)/$$i/language/*.lang"; then \ for h in $(srcdir)/$$i/language/*.lang; do \ - $(INSTALL_DATA) $$h $(DEST)/language/; \ + $(INSTALL_DATA) $$h $(DESTDIR)/language/; \ done; \ fi; \ done; diff -burNp eggdrop1.6.19/eggdrop.conf eggdrop1.6.19-new/eggdrop.conf --- eggdrop1.6.19/eggdrop.conf 2008-02-16 21:15:30.000000000 +0100 +++ eggdrop1.6.19-new/eggdrop.conf 2008-09-23 19:10:36.435603076 +0200 @@ -1359,11 +1359,11 @@ if {[info exists net-type]} { switch -- ${net-type} { "0" { # EFnet - source scripts/quotepong.tcl + source /usr/share/eggdrop/scripts/quotepong.tcl } "2" { # Undernet - source scripts/quotepass.tcl + source /usr/share/eggdrop/scripts/quotepass.tcl } } }