-diff -urN eggdrop1.6.15/INSTALL eggdrop1.6.15-FHS/INSTALL
---- eggdrop1.6.15/INSTALL Mon May 5 00:05:32 2003
-+++ eggdrop1.6.15-FHS/INSTALL Mon May 5 17:55:48 2003
-@@ -61,11 +61,11 @@
+diff -burN eggdrop1.6.17.orig/configure eggdrop1.6.17/configure
+--- eggdrop1.6.17.orig/configure 2004-10-18 00:15:56.795954240 +0200
++++ eggdrop1.6.17/configure 2004-10-18 00:23:38.287796816 +0200
+@@ -315,7 +315,7 @@
+ # include <unistd.h>
+ #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.
+@@ -10113,8 +10113,8 @@
+
+
+
+- if test "${DEST-x}" = "x"; then
+- DEST=\${prefix}
++ if test "${DESTDIR-x}" = "x"; then
++ DESTDIR=\${prefix}
+ fi
+
+
+@@ -10812,7 +10812,7 @@
+ 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 -burN eggdrop1.6.17.orig/doc/html/compiling.html eggdrop1.6.17/doc/html/compiling.html
+--- eggdrop1.6.17.orig/doc/html/compiling.html 2004-10-18 00:15:56.620980840 +0200
++++ eggdrop1.6.17/doc/html/compiling.html 2004-10-18 00:24:19.855477568 +0200
+@@ -147,7 +147,7 @@
+
+ <blockquote>
+ <pre>
+-make install DEST=<directory>
++make install DESTDIR=<directory>
+ </pre>
+ </blockquote>
+
+@@ -155,7 +155,7 @@
+
+ <blockquote>
+ <pre>
+-make install DEST=/home/user/otherdir
++make install DESTDIR=/home/user/otherdir
+ </pre>
+ </blockquote>
+ </ol>
+@@ -255,7 +255,7 @@
+
+ <blockquote>
+ <pre>
+-gmake install DEST='directory'
++gmake install DESTDIR='directory'
+ </pre>
+ </blockquote>
+
+@@ -263,7 +263,7 @@
+
+ <blockquote>
+ <pre>
+-gmake install DEST=/home/user/otherdir
++gmake install DESTDIR=/home/user/otherdir
+ </pre>
+ </blockquote></li>
+ </ol>
+@@ -389,14 +389,14 @@
+
+ <li>Compile the bot using 'make eggdrop'.<br><br></li>
+
+- <li>Install the bot by typing 'make install DEST=<install
++ <li>Install the bot by typing 'make install DESTDIR=<install
+ path>'.<br><br>
+
+ For example:
+
+ <blockquote>
+ <pre>
+-make install DEST='C:/eggdrop/'
++make install DESTDIR='C:/eggdrop/'
+ </pre>
+ </blockquote>
+
+diff -burN eggdrop1.6.17.orig/doc/html/faqs.html eggdrop1.6.17/doc/html/faqs.html
+--- eggdrop1.6.17.orig/doc/html/faqs.html 2004-10-18 00:15:56.612982056 +0200
++++ eggdrop1.6.17/doc/html/faqs.html 2004-10-18 00:24:19.882473464 +0200
+@@ -254,7 +254,7 @@
+
+ <li>
+ <p>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.</p>
+ </li>
+
+diff -burN eggdrop1.6.17.orig/doc/html/install.html eggdrop1.6.17/doc/html/install.html
+--- eggdrop1.6.17.orig/doc/html/install.html 2004-10-18 00:15:56.623980384 +0200
++++ eggdrop1.6.17/doc/html/install.html 2004-10-18 00:24:19.894471640 +0200
+@@ -100,13 +100,13 @@
+ <p>If you want to install to a different directory, use:</p>
+
+ <blockquote>
+- <p>make install DEST=<directory></p>
++ <p>make install DESTDIR=<directory></p>
+ </blockquote>
+
+ <p>For example:</p>
+
+ <blockquote>
+- <p>make install DEST=/home/user/otherdir</p>
++ <p>make install DESTDIR=/home/user/otherdir</p>
+ </blockquote>
+
+ <p>Note that you must use full path for every file to be correctly
+diff -burN eggdrop1.6.17.orig/doc/html/readme.html eggdrop1.6.17/doc/html/readme.html
+--- eggdrop1.6.17.orig/doc/html/readme.html 2004-10-18 00:15:56.632979016 +0200
++++ eggdrop1.6.17/doc/html/readme.html 2004-10-18 00:24:19.979458720 +0200
+@@ -261,7 +261,7 @@
+ <blockquote>
+ <p>If you followed <a href="install.html">Compilation and
+ Installation of Eggdrop</a> 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 -burN eggdrop1.6.17.orig/doc/html/starting.html eggdrop1.6.17/doc/html/starting.html
+--- eggdrop1.6.17.orig/doc/html/starting.html 2004-10-18 00:15:56.613981904 +0200
++++ eggdrop1.6.17/doc/html/starting.html 2004-10-18 00:24:19.983458112 +0200
+@@ -97,7 +97,7 @@
+ Eggdrop, you just have to do:</p>
+
+ <blockquote>
+- <p><em>make DEST="directory" install</em></p>
++ <p><em>make DESTDIR="directory" install</em></p>
+ </blockquote>
+
+ <p>and it will copy all the necessary files.</p>
+diff -burN eggdrop1.6.17.orig/doc/Makefile.in eggdrop1.6.17/doc/Makefile.in
+--- eggdrop1.6.17.orig/doc/Makefile.in 2004-10-18 00:15:56.638978104 +0200
++++ eggdrop1.6.17/doc/Makefile.in 2004-10-18 00:23:49.173141992 +0200
+@@ -34,39 +34,39 @@
+ @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 -burN eggdrop1.6.17.orig/eggdrop.conf eggdrop1.6.17/eggdrop.conf
+--- eggdrop1.6.17.orig/eggdrop.conf 2004-10-18 00:15:56.808952264 +0200
++++ eggdrop1.6.17/eggdrop.conf 2004-10-18 00:26:48.348903136 +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 @@
+
+ # 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.
+@@ -420,7 +420,7 @@
+ # 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/"
+
+
+ #### DNS MODULE ####
+@@ -1327,17 +1327,17 @@
+ # 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
++# source /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 downwards 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
+diff -burN eggdrop1.6.17.orig/INSTALL eggdrop1.6.17/INSTALL
+--- eggdrop1.6.17.orig/INSTALL 2004-10-18 00:15:56.820950440 +0200
++++ eggdrop1.6.17/INSTALL 2004-10-18 00:21:41.065617296 +0200
+@@ -66,11 +66,11 @@
If you want to install to a different directory, use:
Note that you must use full path for every file to be correctly
installed.
-diff -urN eggdrop1.6.15/Makefile.in eggdrop1.6.15-FHS/Makefile.in
---- eggdrop1.6.15/Makefile.in Mon May 5 00:05:32 2003
-+++ eggdrop1.6.15-FHS/Makefile.in Mon May 5 17:55:48 2003
+diff -burN eggdrop1.6.17.orig/Makefile.in eggdrop1.6.17/Makefile.in
+--- eggdrop1.6.17.orig/Makefile.in 2004-10-18 00:15:56.809952112 +0200
++++ eggdrop1.6.17/Makefile.in 2004-10-18 00:22:54.704422496 +0200
@@ -11,7 +11,7 @@
@SET_MAKE@
EGGEXEC = @EGGEXEC@
EGGVERSION = @EGGVERSION@
-@@ -116,7 +116,7 @@
+@@ -120,7 +120,7 @@
MAKE_CONFIG = $(MAKE) 'MAKE=$(MAKE)'
all: @DEFAULT_MAKE@
-@@ -301,105 +301,105 @@
+@@ -309,109 +309,109 @@
echo ""; \
exit 1; \
fi
- @if test "x$(DEST)" = "x"; then \
-- echo "You must specify a destination directory with DEST="; \
+ @if test "x$(DESTDIR)" = "x"; then \
-+ echo "You must specify a destination directory with DESTDIR="; \
+ 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 ""
- @echo "Installing in directory: '$(DEST)'."
+ @echo "Installing in directory: '$(DESTDIR)'."
- @echo
+ @echo ""
- @if test ! -d $(DEST); then \
-- echo "Creating directory: $(DEST)."; \
-- $(top_srcdir)/misc/mkinstalldirs $(DEST); \
+- 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); \
++ echo "Creating directory '$(DESTDIR)'."; \
++ $(top_srcdir)/misc/mkinstalldirs $(DESTDIR) >/dev/null; \
fi
install-bin:
fi
- @if test -f $(DEST)/$(EGGEXEC); then \
+ @if test -f $(DESTDIR)/$(EGGEXEC); then \
- echo "Renamed the old '$(EGGEXEC)' executable to 'o$(EGGEXEC)'."; \
+ echo "Renaming old '$(EGGEXEC)' executable to 'o$(EGGEXEC)'."; \
- mv -f $(DEST)/$(EGGEXEC) $(DEST)/o$(EGGEXEC); \
+ mv -f $(DESTDIR)/$(EGGEXEC) $(DESTDIR)/o$(EGGEXEC); \
fi
install-modules:
- @if test -h $(DEST)/modules; then \
+ @if test -h $(DESTDIR)/modules; then \
- echo "Removing symlink to archival modules directory."; \
+ 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' directory."; \
+ 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; \
@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) directory and symlink."; \
-- $(top_srcdir)/misc/mkinstalldirs $(DEST)/modules-$(EGGVERSION); \
-+ $(top_srcdir)/misc/mkinstalldirs $(DESTDIR)/modules-$(EGGVERSION); \
+ 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); \
- @if test ! -d $(DEST)/logs; then \
+ @if test ! -d $(DESTDIR)/logs; then \
echo "Creating 'logs' subdirectory."; \
-- $(top_srcdir)/misc/mkinstalldirs $(DEST)/logs; \
+- $(top_srcdir)/misc/mkinstalldirs $(DEST)/logs >/dev/null; \
- $(INSTALL_DATA) $(srcdir)/logs/CONTENTS $(DEST)/logs/; \
-+ $(top_srcdir)/misc/mkinstalldirs $(DESTDIR)/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; \
-+ $(top_srcdir)/misc/mkinstalldirs $(DESTDIR)/text; \
+- $(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 ! -d $(DEST)/help; then \
+ if test ! -d $(DESTDIR)/help; then \
echo "Creating 'help' subdirectory."; \
-- $(top_srcdir)/misc/mkinstalldirs $(DEST)/help; \
-+ $(top_srcdir)/misc/mkinstalldirs $(DESTDIR)/help; \
+- $(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/; \
- 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; \
-+ $(top_srcdir)/misc/mkinstalldirs $(DESTDIR)/help/msg; \
+- $(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/; \
- 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; \
-+ $(top_srcdir)/misc/mkinstalldirs $(DESTDIR)/help/set; \
+- $(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/; \
done; \
fi
@cd src/mod/ && $(MAKE_INSTALL) install-help
-@@ -407,25 +407,25 @@
+@@ -419,25 +419,25 @@
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; \
-+ $(top_srcdir)/misc/mkinstalldirs $(DESTDIR)/language; \
+- $(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-filesys:
- @if test ! -d $(DEST)/filesys; then \
+ @if test ! -d $(DESTDIR)/filesys; then \
- echo "Creating a skeletal filesys subdirectory."; \
-- $(top_srcdir)/misc/mkinstalldirs $(DEST)/filesys; \
-- $(top_srcdir)/misc/mkinstalldirs $(DEST)/filesys/incoming; \
-+ $(top_srcdir)/misc/mkinstalldirs $(DESTDIR)/filesys; \
-+ $(top_srcdir)/misc/mkinstalldirs $(DESTDIR)/filesys/incoming; \
+ 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:
@cd doc/ && $(MAKE_INSTALL) install
install-scripts:
-@@ -438,7 +438,7 @@
+@@ -450,7 +450,7 @@
@echo "You MUST ensure that you edit/verify your configuration file."
@echo "An example configuration file, eggdrop.conf, is distributed with Eggdrop."
@echo ""
@echo ""
#safety hash
-diff -urN eggdrop1.6.15/configure eggdrop1.6.15-FHS/configure
---- eggdrop1.6.15/configure Mon May 5 00:08:25 2003
-+++ eggdrop1.6.15-FHS/configure Mon May 5 17:55:48 2003
-@@ -7256,9 +7256,9 @@
- #define EGG_VERSION $egg_version_num
- _ACEOF
-
--if test "${DEST-x}" = "x"
-+if test "${DESTDIR-x}" = "x"
- then
-- DEST=\${prefix}
-+ DESTDIR=\${prefix}
- fi
-
- case "$srcdir" in
-@@ -7922,7 +7922,7 @@
- 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 -urN eggdrop1.6.15/doc/Makefile.in eggdrop1.6.15-FHS/doc/Makefile.in
---- eggdrop1.6.15/doc/Makefile.in Mon May 5 00:05:32 2003
-+++ eggdrop1.6.15-FHS/doc/Makefile.in Mon May 5 17:55:48 2003
-@@ -35,37 +35,37 @@
- @rm -f *~
-
- install:
-- @if test ! -d $(DEST)/doc; then \
-+ @if test ! -d $(DESTDIR)/doc; then \
- echo "Creating a doc subdirectory."; \
-- $(top_srcdir)/misc/mkinstalldirs $(DEST)/doc; \
-+ $(top_srcdir)/misc/mkinstalldirs $(DESTDIR)/doc; \
- fi
-- @if test ! -d $(DEST)/doc/man1; then \
-- $(top_srcdir)/misc/mkinstalldirs $(DEST)/doc/man1; \
-+ @if test ! -d $(DESTDIR)/doc/man1; then \
-+ $(top_srcdir)/misc/mkinstalldirs $(DESTDIR)/doc/man1; \
- fi
-- @if test ! -d $(DEST)/doc/html; then \
-- $(top_srcdir)/misc/mkinstalldirs $(DEST)/doc/html; \
-+ @if test ! -d $(DESTDIR)/doc/html; then \
-+ $(top_srcdir)/misc/mkinstalldirs $(DESTDIR)/doc/html; \
- fi
-- @if test ! -d $(DEST)/doc/settings; then \
-- $(top_srcdir)/misc/mkinstalldirs $(DEST)/doc/settings; \
-+ @if test ! -d $(DESTDIR)/doc/settings; then \
-+ $(top_srcdir)/misc/mkinstalldirs $(DESTDIR)/doc/settings; \
- 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 -urN eggdrop1.6.15/doc/html/faqs.html eggdrop1.6.15-FHS/doc/html/faqs.html
---- eggdrop1.6.15/doc/html/faqs.html Mon May 5 00:05:32 2003
-+++ eggdrop1.6.15-FHS/doc/html/faqs.html Mon May 5 17:55:48 2003
-@@ -264,7 +264,7 @@
-
- <li>
- <p>If it's not your machine, you make 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.</p>
- </li>
-
-diff -urN eggdrop1.6.15/doc/html/install.html eggdrop1.6.15-FHS/doc/html/install.html
---- eggdrop1.6.15/doc/html/install.html Mon May 5 00:05:32 2003
-+++ eggdrop1.6.15-FHS/doc/html/install.html Mon May 5 17:55:48 2003
-@@ -96,13 +96,13 @@
- <p>If you want to install to a different directory, use:</p>
-
- <blockquote>
-- <p>make install DEST=<directory></p>
-+ <p>make install DESTDIR=<directory></p>
- </blockquote>
-
- <p>For example:</p>
-
- <blockquote>
-- <p>make install DEST=/home/user/otherdir</p>
-+ <p>make install DESTDIR=/home/user/otherdir</p>
- </blockquote>
-
- <p>Note that you must use full path for every file to be correctly
-diff -urN eggdrop1.6.15/doc/html/readme.html eggdrop1.6.15-FHS/doc/html/readme.html
---- eggdrop1.6.15/doc/html/readme.html Mon May 5 00:05:32 2003
-+++ eggdrop1.6.15-FHS/doc/html/readme.html Mon May 5 17:55:48 2003
-@@ -261,7 +261,7 @@
- <blockquote>
- <p>If you followed <a href="install.html">Compilation and
- Installation of Eggdrop</a> 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 -urN eggdrop1.6.15/doc/html/starting.html eggdrop1.6.15-FHS/doc/html/starting.html
---- eggdrop1.6.15/doc/html/starting.html Mon May 5 00:05:32 2003
-+++ eggdrop1.6.15-FHS/doc/html/starting.html Mon May 5 17:55:48 2003
-@@ -91,7 +91,7 @@
- Eggdrop, you just have to do:</p>
-
- <blockquote>
-- <p><em>make DEST="directory" install</em></p>
-+ <p><em>make DESTDIR="directory" install</em></p>
- </blockquote>
-
- <p>and it will copy all the necessary files.</p>
-diff -urN eggdrop1.6.15/eggdrop.conf eggdrop1.6.15-FHS/eggdrop.conf
---- eggdrop1.6.15/eggdrop.conf Mon May 5 00:05:32 2003
-+++ eggdrop1.6.15-FHS/eggdrop.conf Mon May 5 17:55:48 2003
-@@ -1,4 +1,4 @@
--#! /path/to/executable/eggdrop
-+#!/usr/bin/eggdrop
- # ^- This should contain a fully qualified path to your Eggdrop executable.
- #
- # $Id$
-@@ -187,22 +187,22 @@
-
- # 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.doc 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.doc 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.
-@@ -422,7 +422,7 @@
- # 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/"
-
-
- #### DNS MODULE ####
-@@ -1320,17 +1320,17 @@
- # 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
-+# source /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 downwards 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
-diff -urN eggdrop1.6.15/scripts/Makefile.in eggdrop1.6.15-FHS/scripts/Makefile.in
---- eggdrop1.6.15/scripts/Makefile.in Mon May 5 00:05:32 2003
-+++ eggdrop1.6.15-FHS/scripts/Makefile.in Mon May 5 17:55:48 2003
+diff -burN eggdrop1.6.17.orig/scripts/Makefile.in eggdrop1.6.17/scripts/Makefile.in
+--- eggdrop1.6.17.orig/scripts/Makefile.in 2004-10-18 00:15:56.805952720 +0200
++++ eggdrop1.6.17/scripts/Makefile.in 2004-10-18 00:27:06.471148136 +0200
@@ -31,44 +31,44 @@
@rm -f *~
install:
- @if test ! -d $(DEST)/scripts; then \
+ @if test ! -d $(DESTDIR)/scripts; then \
- echo "Creating a scripts subdirectory."; \
-- $(top_srcdir)/misc/mkinstalldirs $(DEST)/scripts; \
-+ $(top_srcdir)/misc/mkinstalldirs $(DESTDIR)/scripts; \
+ 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/; \
- if test ! -d $(DEST)/help; then \
+ if test ! -d $(DESTDIR)/help; then \
echo "Creating 'help' subdirectory."; \
-- $(top_srcdir)/misc/mkinstalldirs $(DEST)/help; \
-+ $(top_srcdir)/misc/mkinstalldirs $(DESTDIR)/help; \
+- $(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/; \
- 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; \
-+ $(top_srcdir)/misc/mkinstalldirs $(DESTDIR)/help/msg; \
+- $(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/; \
- 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; \
-+ $(top_srcdir)/misc/mkinstalldirs $(DESTDIR)/help/set; \
+- $(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/; \
done; \
fi; \
fi
-diff -urN eggdrop1.6.15/src/eggdrop.h eggdrop1.6.15-FHS/src/eggdrop.h
---- eggdrop1.6.15/src/eggdrop.h Mon May 5 00:05:32 2003
-+++ eggdrop1.6.15-FHS/src/eggdrop.h Mon May 5 17:57:01 2003
-@@ -85,7 +85,7 @@
+diff -burN eggdrop1.6.17.orig/src/eggdrop.h eggdrop1.6.17/src/eggdrop.h
+--- eggdrop1.6.17.orig/src/eggdrop.h 2004-10-18 00:15:56.762959256 +0200
++++ eggdrop1.6.17/src/eggdrop.h 2004-10-18 00:27:26.368123336 +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
+ #define BASELANG "english" /* language which always gets loaded before
all other languages. You do not want to
change this. */
-diff -urN eggdrop1.6.15/src/mod/Makefile.in eggdrop1.6.15-FHS/src/mod/Makefile.in
---- eggdrop1.6.15/src/mod/Makefile.in Mon May 5 00:05:32 2003
-+++ eggdrop1.6.15-FHS/src/mod/Makefile.in Mon May 5 17:55:48 2003
-@@ -122,50 +122,50 @@
+diff -burN eggdrop1.6.17.orig/src/mod/Makefile.in eggdrop1.6.17/src/mod/Makefile.in
+--- eggdrop1.6.17.orig/src/mod/Makefile.in 2004-10-18 00:15:56.711967008 +0200
++++ eggdrop1.6.17/src/mod/Makefile.in 2004-10-18 00:27:34.444895480 +0200
+@@ -121,50 +121,50 @@
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; \
-+ $(top_srcdir)/misc/mkinstalldirs $(DESTDIR)/help; \
+- $(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 \
- @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; \
-+ $(top_srcdir)/misc/mkinstalldirs $(DESTDIR)/help/msg; \
+- $(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 \
- @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; \
-+ $(top_srcdir)/misc/mkinstalldirs $(DESTDIR)/help/set; \
+- $(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 \
- @if test ! -d $(DEST)/language; then \
+ @if test ! -d $(DESTDIR)/language; then \
echo "Creating 'language' subdirectory."; \
-- $(top_srcdir)/misc/mkinstalldirs $(DEST)/language; \
-+ $(top_srcdir)/misc/mkinstalldirs $(DESTDIR)/language; \
+- $(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 \
projects / packages / eggdrop.git / commitdiff