[eggheads-patches] PATCH: putlog-misc-part2.diff

Tothwolf tothwolf at concentric.net
Tue Oct 26 18:52:34 CST 1999


putlog-misc-part2.diff:
  Fixed 4 putlog() statements in src/mod/irc.mod/msgcmds.c
  TCL_PATCH_LEVEL configure stuff fixed properly
  Some Makefile.in files were missing SHELL = /bin/sh line
  Simplified 4 target make stuff
  $(EGGEXEC) will not be rebuilt again if it exists (proper behavior now)
  Added MAKE_MD5 var to src/Makefile.in
  Use $(top_srcdir)/mkinstalldirs instead of $(INSTALL) -d for compat reasons
  Install scripts/CONTENTS when installing scripts
  Only install script helpfiles when installing scripts
  Fixed dependency rules in module Makefiles

  Added file: mkinstalldirs

-Toth
-------------- next part --------------
diff -urNPX ../exclude ../eggdrop1.3.tmp/Makefile.in ./Makefile.in
--- ../eggdrop1.3.tmp/Makefile.in	Mon Oct 25 21:24:45 1999
+++ ./Makefile.in	Mon Oct 25 20:53:28 1999
@@ -4,7 +4,9 @@
 #
 
 SHELL = /bin/sh
+top_srcdir = @top_srcdir@
 
+ at SET_MAKE@
 prefix = @prefix@
 DEST = @DEST@
 EGGEXEC = @EGGEXEC@
@@ -56,34 +58,37 @@
 TCLLIBFN = @TCLLIBFN@
 
 CFLAGS = @CFLAGS@ -I.. @DEFS@ $(CFLGS)
- at SET_MAKE@
-
-MAKE_STATIC = $(MAKE) 'CC=$(CC)' 'LD=$(LD)' 'STRIP=$(STRIP)' \
-'RANLIB=$(RANLIB)' 'CFLAGS=$(CFLAGS) -DSTATIC' \
-'CPPFLAGS=$(CPPFLAGS)' 'EGGEXEC=$(EGGEXEC)' 'TCLLIB=$(TCLLIB)' \
-'TCLLIBFN=$(TCLLIBFN)' 'XREQS=$(XREQS)' 'XLIBS=$(XLIBS)'
 
 MAKE_MODEGG = $(MAKE) 'CC=$(MOD_CC)' 'LD=$(MOD_LD)' 'STRIP=$(MOD_STRIP)' \
 'RANLIB=$(RANLIB)' 'CFLAGS=$(CFLAGS)' \
 'CPPFLAGS=$(CPPFLAGS)' 'EGGEXEC=$(EGGEXEC)' 'TCLLIB=$(TCLLIB)' \
-'TCLLIBFN=$(TCLLIBFN)' 'XREQS=$(XREQS)' 'XLIBS=$(XLIBS)'
+'TCLLIBFN=$(TCLLIBFN)' 'XREQS=$(XREQS)' 'XLIBS=$(XLIBS)' \
+'EGGBUILD=' 'MODOBJS='
 
 MAKE_MODULES = $(MAKE) 'CC=$(SHLIB_CC)' 'LD=$(SHLIB_LD)' \
 'STRIP=$(SHLIB_STRIP)' 'CFLAGS=$(CFLAGS)' 'CPPFLAGS=$(CPPFLAGS)'
 
-MAKE_SDEBUG = $(MAKE) 'CC=$(CC)' 'LD=$(LD)' 'STRIP=touch' \
-'RANLIB=$(RANLIB)' 'CFLAGS=-g3 $(CFLAGS) -DSTATIC -DEBUG_MEM' \
+MAKE_STATIC = $(MAKE) 'CC=$(CC)' 'LD=$(LD)' 'STRIP=$(STRIP)' \
+'RANLIB=$(RANLIB)' 'CFLAGS=$(CFLAGS) -DSTATIC' \
 'CPPFLAGS=$(CPPFLAGS)' 'EGGEXEC=$(EGGEXEC)' 'TCLLIB=$(TCLLIB)' \
-'TCLLIBFN=$(TCLLIBFN)' 'XREQS=$(XREQS)' 'XLIBS=$(XLIBS)'
+'TCLLIBFN=$(TCLLIBFN)' 'XREQS=$(XREQS)' 'XLIBS=$(XLIBS)' \
+'EGGBUILD=(static version)' 'MODOBJS=mod/*.o'
 
-MAKE_MEMEGG = $(MAKE) 'CC=$(MOD_CC)' 'LD=$(MOD_LD)' 'STRIP=touch' \
+MAKE_DEBEGG = $(MAKE) 'CC=$(MOD_CC)' 'LD=$(MOD_LD) -g' 'STRIP=touch' \
 'RANLIB=$(RANLIB)' 'CFLAGS=-g3 $(CFLAGS) -DEBUG_MEM' \
 'CPPFLAGS=$(CPPFLAGS)' 'EGGEXEC=$(EGGEXEC)' 'TCLLIB=$(TCLLIB)' \
-'TCLLIBFN=$(TCLLIBFN)' 'XREQS=$(XREQS)' 'XLIBS=$(XLIBS)'
+'TCLLIBFN=$(TCLLIBFN)' 'XREQS=$(XREQS)' 'XLIBS=$(XLIBS)' \
+'EGGBUILD=(debug version)' 'MODOBJS='
 
 MAKE_DEBMODULES = $(MAKE) 'CC=$(SHLIB_CC)' 'LD=$(SHLIB_LD)' \
 'STRIP=touch' 'CFLAGS=-g3 $(CFLAGS) -DEBUG_MEM' 'CPPFLAGS=$(CPPFLAGS)'
 
+MAKE_SDEBUG = $(MAKE) 'CC=$(CC)' 'LD=$(LD) -g' 'STRIP=touch' \
+'RANLIB=$(RANLIB)' 'CFLAGS=-g3 $(CFLAGS) -DSTATIC -DEBUG_MEM' \
+'CPPFLAGS=$(CPPFLAGS)' 'EGGEXEC=$(EGGEXEC)' 'TCLLIB=$(TCLLIB)' \
+'TCLLIBFN=$(TCLLIBFN)' 'XREQS=$(XREQS)' 'XLIBS=$(XLIBS)' \
+'EGGBUILD=(static and debug version)' 'MODOBJS=mod/*.o'
+
 MAKE_INSTALL = $(MAKE) 'DEST=$(DEST)'
 
 all: @DEFAULT_MAKE@
@@ -115,7 +120,7 @@
 eggdrop: modegg modules
 
 modegg: modtest
-	@cd src; $(MAKE_MODEGG) modegg
+	@cd src; $(MAKE_MODEGG) $(EGGEXEC)
 	@echo ""
 	@./$(EGGEXEC) -v
 	@ls -l $(EGGEXEC)
@@ -134,7 +139,7 @@
 	@echo ""
 	@echo "Making core eggdrop for static linking..."
 	@echo ""
-	@cd src; $(MAKE_STATIC) static
+	@cd src; $(MAKE_STATIC) $(EGGEXEC)
 	@echo ""
 	@./$(EGGEXEC) -v
 	@ls -l $(EGGEXEC)
@@ -142,7 +147,7 @@
 debug: debegg debmodules
 
 debegg: modtest
-	@cd src; $(MAKE_MEMEGG) debegg
+	@cd src; $(MAKE_DEBEGG) $(EGGEXEC)
 	@echo ""
 	@./$(EGGEXEC) -v
 	@ls -l $(EGGEXEC)
@@ -161,7 +166,7 @@
 	@echo ""
 	@echo "Making core eggdrop for static linking..."
 	@echo ""
-	@cd src; $(MAKE_SDEBUG) sdebug
+	@cd src; $(MAKE_SDEBUG) $(EGGEXEC)
 	@echo ""
 	@./$(EGGEXEC) -v
 	@ls -l $(EGGEXEC)
@@ -218,7 +223,7 @@
 	@echo
 	@if test ! -d $(DEST); then \
 		echo "Creating directory: $(DEST)."; \
-		$(INSTALL) -d $(DEST); \
+		$(top_srcdir)/mkinstalldirs $(DEST); \
 	fi
 
 install-bin:
@@ -250,7 +255,7 @@
 	@if test ! "x`echo *.so`" = "x*.so"; then \
 		if test ! -d $(DEST)/modules-$(EGGVERSION); then \
 			echo "Creating modules-$(EGGVERSION) directory and symlink."; \
-			$(INSTALL) -d $(DEST)/modules-$(EGGVERSION); \
+			$(top_srcdir)/mkinstalldirs $(DEST)/modules-$(EGGVERSION); \
 		fi; \
 		(cd $(DEST) && $(LN_S) modules-$(EGGVERSION) modules); \
 		echo "Copying new modules."; \
@@ -273,7 +278,7 @@
 	@if test ! "x`echo help/*.help`" = "xhelp/*.help"; then \
 		if test ! -d $(DEST)/help; then \
 			echo "Creating 'help' subdirectory."; \
-			$(INSTALL) -d $(DEST)/help; \
+			$(top_srcdir)/mkinstalldirs $(DEST)/help; \
 		fi; \
 		for i in help/*.help; do \
 			$(INSTALL_DATA) $$i $(DEST)/help/; \
@@ -282,7 +287,7 @@
 	@if test ! "x`echo help/msg/*.help`" = "xhelp/msg/*.help"; then \
 		if test ! -d $(DEST)/help/msg; then \
 			echo "Creating 'help/msg' subdirectory."; \
-			$(INSTALL) -d $(DEST)/help/msg; \
+			$(top_srcdir)/mkinstalldirs $(DEST)/help/msg; \
 		fi; \
 		for i in help/msg/*.help; do \
 			$(INSTALL_DATA) $$i $(DEST)/help/msg/; \
@@ -291,7 +296,7 @@
 	@if test ! "x`echo help/set/*.help`" = "xhelp/set/*.help"; then \
 		if test ! -d $(DEST)/help/set; then \
 			echo "Creating 'help/set' subdirectory."; \
-			$(INSTALL) -d $(DEST)/help/set; \
+			$(top_srcdir)/mkinstalldirs $(DEST)/help/set; \
 		fi; \
 		for i in help/set/*.help; do \
 			$(INSTALL_DATA) $$i $(DEST)/help/set/; \
@@ -304,7 +309,7 @@
 	@if test ! "x`echo language/*.lang`" = "xlanguage/*.lang"; then \
 		if test ! -d $(DEST)/language; then \
 			echo "Creating 'language' subdirectory."; \
-			$(INSTALL) -d $(DEST)/language; \
+			$(top_srcdir)/mkinstalldirs $(DEST)/language; \
 		fi; \
 		for i in language/*.lang; do \
 			$(INSTALL_DATA) $$i $(DEST)/language/; \
@@ -315,8 +320,8 @@
 install-filesys:
 	@if test ! -d $(DEST)/filesys; then \
 		echo "Creating a skeletal filesys subdirectory."; \
-		$(INSTALL) -d $(DEST)/filesys; \
-		$(INSTALL) -d $(DEST)/filesys/incoming; \
+		$(top_srcdir)/mkinstalldirs $(DEST)/filesys; \
+		$(top_srcdir)/mkinstalldirs $(DEST)/filesys/incoming; \
 	fi
 
 install-doc:
diff -urNPX ../exclude ../eggdrop1.3.tmp/configure ./configure
--- ../eggdrop1.3.tmp/configure	Mon Oct 25 21:24:45 1999
+++ ./configure	Mon Oct 25 17:30:06 1999
@@ -3116,22 +3116,23 @@
 then
 
   # find Tcl's version
+  TCL_VERSION=`grep TCL_VERSION $TCLINC/$TCLINCFN | head -1 | $AWK '{gsub(/\"/, "", $3); print $3}'`
   TCL_PATCH_LEVEL=`grep TCL_PATCH_LEVEL $TCLINC/$TCLINCFN | head -1 | $AWK '{gsub(/\"/, "", $3); print $3}'`
-  if test ! "x${TCL_PATCH_LEVEL}" = "x"
-  then
-    TCL_VERSION=$TCL_PATCH_LEVEL
-  else
-    TCL_VERSION=`grep TCL_VERSION $TCLINC/$TCLINCFN | head -1 | $AWK '{gsub(/\"/, "", $3); print $3}'`
-  fi
 fi
 
 # check if we found Tcl's version
 echo $ac_n "checking for Tcl version""... $ac_c" 1>&6
-echo "configure:3131: checking for Tcl version" >&5
+echo "configure:3126: checking for Tcl version" >&5
 if test ! "x${TCL_VERSION}" = "x"
 then
-  echo "$ac_t""$TCL_VERSION" 1>&6
-  TCL_FOUND=1
+  if test ! "x${TCL_PATCH_LEVEL}" = "x"
+  then
+    echo "$ac_t""$TCL_PATCH_LEVEL" 1>&6
+    TCL_FOUND=1
+  else
+    echo "$ac_t""$TCL_VERSION" 1>&6
+    TCL_FOUND=1
+  fi
 else
   echo "$ac_t""not found" 1>&6
   TCL_FOUND=0
@@ -3184,7 +3185,7 @@
 
 # check for Tcl threads
 echo $ac_n "checking for Tcl threads""... $ac_c" 1>&6
-echo "configure:3188: checking for Tcl threads" >&5
+echo "configure:3189: checking for Tcl threads" >&5
 TCL_VER_POST81=`echo $TCL_VERSION | $AWK '{split($1, i, "."); if (((i[1] == 8) && (i[2] >= 1)) || (i[1] >= 9)) print "yes"; else print "no"}'`
 if test "x${TCL_VER_POST81}" = "xyes"
 then
diff -urNPX ../exclude ../eggdrop1.3.tmp/configure.in ./configure.in
--- ../eggdrop1.3.tmp/configure.in	Mon Oct 25 21:24:45 1999
+++ ./configure.in	Mon Oct 25 21:45:04 1999
@@ -181,17 +181,17 @@
 	AC_MSG_RESULT([   Digital OSF])
 	if test "x$AWK" = "xgawk"
 	then
-	  AWK="awk"
+	  AWK=awk
 	fi
 	if test "x$INSTALL" = "x./install-sh"
 	then
-	  INSTALL="installbsd"
+	  INSTALL=installbsd
 	fi
-	MOD_CC="cc"
-	MOD_LD="cc"
-	SHLIB_CC="cc"
+	MOD_CC=cc
+	MOD_LD=cc
+	SHLIB_CC=cc
 	SHLIB_LD="ld -shared -expect_unresolved '*'"
-	SHLIB_STRIP="touch"
+	SHLIB_STRIP=touch
 	AC_DEFINE(MODULES_OK)
 	;;
       1.0|1.1|1.2)
@@ -670,21 +670,22 @@
 then
 
   # find Tcl's version
+  TCL_VERSION=`grep TCL_VERSION $TCLINC/$TCLINCFN | head -1 | $AWK '{gsub(/\"/, "", $3); print $3}'`
   TCL_PATCH_LEVEL=`grep TCL_PATCH_LEVEL $TCLINC/$TCLINCFN | head -1 | $AWK '{gsub(/\"/, "", $3); print $3}'`
-  if test ! "x${TCL_PATCH_LEVEL}" = "x"
-  then
-    TCL_VERSION=$TCL_PATCH_LEVEL
-  else
-    TCL_VERSION=`grep TCL_VERSION $TCLINC/$TCLINCFN | head -1 | $AWK '{gsub(/\"/, "", $3); print $3}'`
-  fi
 fi
 
 # check if we found Tcl's version
 AC_MSG_CHECKING(for Tcl version)
 if test ! "x${TCL_VERSION}" = "x"
 then
-  AC_MSG_RESULT($TCL_VERSION)
-  TCL_FOUND=1
+  if test ! "x${TCL_PATCH_LEVEL}" = "x"
+  then
+    AC_MSG_RESULT($TCL_PATCH_LEVEL)
+    TCL_FOUND=1
+  else
+    AC_MSG_RESULT($TCL_VERSION)
+    TCL_FOUND=1
+  fi
 else
   AC_MSG_RESULT(not found)
   TCL_FOUND=0
diff -urNPX ../exclude ../eggdrop1.3.tmp/doc/Makefile.in ./doc/Makefile.in
--- ../eggdrop1.3.tmp/doc/Makefile.in	Sat Oct 16 20:04:07 1999
+++ ./doc/Makefile.in	Mon Oct 25 20:52:59 1999
@@ -1,6 +1,8 @@
 # Makefile for doc/
 
+SHELL = /bin/sh
 top_srcdir = @top_srcdir@
+
 @SET_MAKE@
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -27,11 +29,11 @@
 
 install:
 	@if test ! -d $(DEST)/doc; then \
-	echo "Creating a doc subdirectory."; \
-		$(INSTALL) -d $(DEST)/doc; \
+		echo "Creating a doc subdirectory."; \
+		$(top_srcdir)/mkinstalldirs $(DEST)/doc; \
 	fi
 	@if test ! -d $(DEST)/doc/man1; then \
-		$(INSTALL) -d $(DEST)/doc/man1; \
+		$(top_srcdir)/mkinstalldirs $(DEST)/doc/man1; \
 	fi
 	@echo "Copying docs."
 	@for i in $(DOCS); do \
diff -urNPX ../exclude ../eggdrop1.3.tmp/mkinstalldirs ./mkinstalldirs
--- ../eggdrop1.3.tmp/mkinstalldirs	Wed Dec 31 18:00:00 1969
+++ ./mkinstalldirs	Mon Oct 25 16:58:18 1999
@@ -0,0 +1,40 @@
+#! /bin/sh
+# mkinstalldirs --- make directory hierarchy
+# Author: Noah Friedman <friedman at prep.ai.mit.edu>
+# Created: 1993-05-16
+# Public domain
+
+# $Id: mkinstalldirs,v 1.13 1999/01/05 03:18:55 bje Exp $
+
+errstatus=0
+
+for file
+do
+   set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
+   shift
+
+   pathcomp=
+   for d
+   do
+     pathcomp="$pathcomp$d"
+     case "$pathcomp" in
+       -* ) pathcomp=./$pathcomp ;;
+     esac
+
+     if test ! -d "$pathcomp"; then
+        echo "mkdir $pathcomp"
+
+        mkdir "$pathcomp" || lasterr=$?
+
+        if test ! -d "$pathcomp"; then
+  	  errstatus=$lasterr
+        fi
+     fi
+
+     pathcomp="$pathcomp/"
+   done
+done
+
+exit $errstatus
+
+# mkinstalldirs ends here
diff -urNPX ../exclude ../eggdrop1.3.tmp/scripts/Makefile.in ./scripts/Makefile.in
--- ../eggdrop1.3.tmp/scripts/Makefile.in	Sat Oct 16 20:04:07 1999
+++ ./scripts/Makefile.in	Mon Oct 25 20:53:39 1999
@@ -1,12 +1,16 @@
 # Makefile for scripts/
 
+SHELL = /bin/sh
 top_srcdir = @top_srcdir@
+
 @SET_MAKE@
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 
+DOCS = CONTENTS
+
 SCRIPTS = action.fix.tcl alltools.tcl compat.tcl getops-2.2d.tcl \
 klined.tcl notes2.tcl ques5.tcl sentinel1.54.tcl userinfo1.0.tcl
 
@@ -18,53 +22,52 @@
 	@echo ""
 	@cd $(top_srcdir); $(MAKE)
 
-all: $(SCRIPTS) $(EXESCRIPTS)
+all: $(DOCS) $(SCRIPTS) $(EXESCRIPTS)
 
 clean:
 	@rm -f *~
 
-install: install-scripts install-help
-
-install-scripts:
+install:
 	@if test ! -d $(DEST)/scripts; then \
 		echo "Creating a scripts subdirectory."; \
-		$(INSTALL) -d $(DEST)/scripts; \
+		$(top_srcdir)/mkinstalldirs $(DEST)/scripts; \
 		echo Copying scripts.; \
+		for i in $(DOCS); do \
+			$(INSTALL_DATA) $$i $(DEST)/scripts/; \
+		done; \
 		for i in $(SCRIPTS); do \
 			$(INSTALL_DATA) $$i $(DEST)/scripts/; \
 		done; \
 		for i in $(EXESCRIPTS); do \
 			$(INSTALL_SCRIPT) $$i $(DEST)/scripts/; \
 		done; \
-	fi
-
-install-help:
-	@if test ! "x`echo help/*.help`" = "xhelp/*.help"; then \
-		if test ! -d $(DEST)/help; then \
-			echo "Creating 'help' subdirectory."; \
-			$(INSTALL) -d $(DEST)/help; \
+		if test ! "x`echo help/*.help`" = "xhelp/*.help"; then \
+			if test ! -d $(DEST)/help; then \
+				echo "Creating 'help' subdirectory."; \
+				$(top_srcdir)/mkinstalldirs $(DEST)/help; \
+			fi; \
+			for i in help/*.help; do \
+				$(INSTALL_DATA) $$i $(DEST)/help/; \
+			done; \
 		fi; \
-		for i in help/*.help; do \
-			$(INSTALL_DATA) $$i $(DEST)/help/; \
-		done; \
-	fi
-	@if test ! "x`echo help/msg/*.help`" = "xhelp/msg/*.help"; then \
-		if test ! -d $(DEST)/help/msg; then \
-			echo "Creating 'help/msg' subdirectory."; \
-			$(INSTALL) -d $(DEST)/help/msg; \
+		if test ! "x`echo help/msg/*.help`" = "xhelp/msg/*.help"; then \
+			if test ! -d $(DEST)/help/msg; then \
+				echo "Creating 'help/msg' subdirectory."; \
+				$(top_srcdir)/mkinstalldirs $(DEST)/help/msg; \
+			fi; \
+			for i in help/msg/*.help; do \
+				$(INSTALL_DATA) $$i $(DEST)/help/msg/; \
+			done; \
 		fi; \
-		for i in help/msg/*.help; do \
-			$(INSTALL_DATA) $$i $(DEST)/help/msg/; \
-		done; \
-	fi
-	@if test ! "x`echo help/set/*.help`" = "xhelp/set/*.help"; then \
-		if test ! -d $(DEST)/help/set; then \
-			echo "Creating 'help/set' subdirectory."; \
-			$(INSTALL) -d $(DEST)/help/set; \
+		if test ! "x`echo help/set/*.help`" = "xhelp/set/*.help"; then \
+			if test ! -d $(DEST)/help/set; then \
+				echo "Creating 'help/set' subdirectory."; \
+				$(top_srcdir)/mkinstalldirs $(DEST)/help/set; \
+			fi; \
+			for i in help/set/*.help; do \
+				$(INSTALL_DATA) $$i $(DEST)/help/set/; \
+			done; \
 		fi; \
-		for i in help/set/*.help; do \
-			$(INSTALL_DATA) $$i $(DEST)/help/set/; \
-		done; \
 	fi
 
 #safety hash
diff -urNPX ../exclude ../eggdrop1.3.tmp/src/Makefile.in ./src/Makefile.in
--- ../eggdrop1.3.tmp/src/Makefile.in	Mon Oct 25 21:24:45 1999
+++ ./src/Makefile.in	Mon Oct 25 21:59:50 1999
@@ -1,6 +1,8 @@
 # Makefile for src/
 
+SHELL = /bin/sh
 top_srcdir = @top_srcdir@
+
 @SET_MAKE@
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -12,45 +14,25 @@
 modules.o net.o rfc1459.o tcl.o tcldcc.o tclhash.o \
 tclmisc.o tcluser.o userent.o userrec.o users.o md5/md5c.o
 
+MAKE_MD5 = $(MAKE) 'MAKE=$(MAKE)' 'CC=$(CC)' 'LD=$(LD)' \
+'STRIP=$(STRIP)' 'CFLAGS=$(CFLAGS)' 'CPPFLAGS=$(CPPFLAGS)'
+
 doofus:
 	@echo ""
 	@echo "Let's try this from the right directory..."
 	@echo ""
 	@cd $(top_srcdir); $(MAKE)
 
-modegg: $(OBJS) $(XREQS)
+../$(EGGEXEC): $(OBJS) $(XREQS)
 	@echo ""
-	@echo "Linking eggdrop..."
+	@echo "Linking eggdrop... $(EGGBUILD)"
 	@echo ""
-	$(LD) -o ../$(EGGEXEC) $(OBJS) $(XLIBS)
+	$(LD) -o ../$(EGGEXEC) $(OBJS) $(MODOBJS) $(XLIBS)
 	$(STRIP) ../$(EGGEXEC)
 	@echo "Successful compile: $(EGGEXEC)"
 	@echo ""
 
-static: $(OBJS) $(XREQS)
-	@echo ""
-	@echo "Linking eggdrop... (static version)"
-	@echo ""
-	$(LD) -o ../$(EGGEXEC) $(OBJS) mod/*.o $(XLIBS)
-	$(STRIP) ../$(EGGEXEC)
-	@echo "Successful compile: $(EGGEXEC)"
-	@echo ""
-
-debegg: $(OBJS) $(XREQS)
-	@echo ""
-	@echo "Linking eggdrop... (debug version)"
-	@echo ""
-	$(LD) -g -o ../$(EGGEXEC) $(OBJS) $(XLIBS)
-	@echo "Successful compile: $(EGGEXEC)"
-	@echo ""
-
-sdebug: $(OBJS) $(XREQS)
-	@echo ""
-	@echo "Linking eggdrop... (static and debug version)"
-	@echo ""
-	$(LD) -g -o ../$(EGGEXEC) $(OBJS) mod/*.o $(XLIBS)
-	@echo "Successful compile: $(EGGEXEC)"
-	@echo ""
+$(EGGEXEC): ../$(EGGEXEC)
 
 clean:
 	@rm -f *.o *.a *~
@@ -66,8 +48,7 @@
 '-DSTRIPFLAGS="$(STRIP)"' -c main.c
 
 md5/md5c.o:
-	@cd md5; $(MAKE) 'MAKE=$(MAKE)' 'CC=$(CC)' 'LD=$(LD)' \
-'STRIP=$(STRIP)' 'CFLAGS=$(CFLAGS)' 'CPPFLAGS=$(CPPFLAGS)' md5
+	@cd md5; $(MAKE_MD5) md5
 	@echo "---------- Yeah! that's the compiling, now the linking! ----------"
 
 libtcle.a: $(TCLLIB)/lib$(TCLLIBFN)
diff -urNPX ../exclude ../eggdrop1.3.tmp/src/md5/Makefile.in ./src/md5/Makefile.in
--- ../eggdrop1.3.tmp/src/md5/Makefile.in	Sat Oct 16 11:49:36 1999
+++ ./src/md5/Makefile.in	Mon Oct 25 17:19:34 1999
@@ -1,6 +1,8 @@
 # Makefile for src/md5/
 
+SHELL = /bin/sh
 top_srcdir = @top_srcdir@
+
 @SET_MAKE@
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
diff -urNPX ../exclude ../eggdrop1.3.tmp/src/mod/Makefile.in ./src/mod/Makefile.in
--- ../eggdrop1.3.tmp/src/mod/Makefile.in	Sun Oct 17 15:40:18 1999
+++ ./src/mod/Makefile.in	Mon Oct 25 20:53:52 1999
@@ -1,6 +1,8 @@
 # Makefile for src/mod/
 
+SHELL = /bin/sh
 top_srcdir = @top_srcdir@
+
 @SET_MAKE@
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -34,7 +36,7 @@
 	@if test ! "x`echo *.mod/help/*.help`" = "x*.mod/help/*.help"; then \
 		if test ! -d $(DEST)/help; then \
 			echo "Creating 'help' subdirectory."; \
-			$(INSTALL) -d $(DEST)/help; \
+			$(top_srcdir)/mkinstalldirs $(DEST)/help; \
 		fi; \
 		for i in *.mod/help/*.help; do \
 			$(INSTALL_DATA) $$i $(DEST)/help/; \
@@ -43,7 +45,7 @@
 	@if test ! "x`echo *.mod/help/msg/*.help`" = "x*.mod/help/msg/*.help"; then \
 		if test ! -d $(DEST)/help/msg; then \
 			echo "Creating 'help/msg' subdirectory."; \
-			$(INSTALL) -d $(DEST)/help/msg; \
+			$(top_srcdir)/mkinstalldirs $(DEST)/help/msg; \
 		fi; \
 		for i in *.mod/help/msg/*.help; do \
 			$(INSTALL_DATA) $$i $(DEST)/help/msg/; \
@@ -52,7 +54,7 @@
 	@if test ! "x`echo *.mod/help/set/*.help`" = "x*.mod/help/set/*.help"; then \
 		if test ! -d $(DEST)/help/set; then \
 			echo "Creating 'help/set' subdirectory."; \
-			$(INSTALL) -d $(DEST)/help/set; \
+			$(top_srcdir)/mkinstalldirs $(DEST)/help/set; \
 		fi; \
 		for i in *.mod/help/set/*.help; do \
 			$(INSTALL_DATA) $$i $(DEST)/help/set/; \
@@ -64,7 +66,7 @@
 	@if test ! "x`echo *.mod/language/*.lang`" = "x*.mod/language/*.lang"; then \
 		if test ! -d $(DEST)/language; then \
 			echo "Creating 'language' subdirectory."; \
-			$(INSTALL) -d $(DEST)/language; \
+			$(top_srcdir)/mkinstalldirs $(DEST)/language; \
 		fi; \
 		for i in *.mod/language/*.lang; do \
 			$(INSTALL_DATA) $$i $(DEST)/language/; \
diff -urNPX ../exclude ../eggdrop1.3.tmp/src/mod/assoc.mod/Makefile ./src/mod/assoc.mod/Makefile
--- ../eggdrop1.3.tmp/src/mod/assoc.mod/Makefile	Mon Oct 25 21:24:46 1999
+++ ./src/mod/assoc.mod/Makefile	Mon Oct 25 18:07:16 1999
@@ -13,7 +13,8 @@
 
 modules: ../../../assoc.so
 
-../assoc.o: ../module.h ../modvals.h ../../eggdrop.h ../../tandem.h
+../assoc.o: assoc.c ../module.h ../modvals.h ../../eggdrop.h \
+../../tandem.h
 	$(CC) $(CFLAGS) $(CPPFLAGS) -DMAKING_MODS -c assoc.c
 	rm -f ../assoc.o
 	mv assoc.o ../
diff -urNPX ../exclude ../eggdrop1.3.tmp/src/mod/blowfish.mod/Makefile ./src/mod/blowfish.mod/Makefile
--- ../eggdrop1.3.tmp/src/mod/blowfish.mod/Makefile	Mon Oct 25 21:24:46 1999
+++ ./src/mod/blowfish.mod/Makefile	Mon Oct 25 18:05:06 1999
@@ -13,7 +13,8 @@
 
 modules: ../../../blowfish.so
 
-../blowfish.o: ../module.h ../modvals.h ../../eggdrop.h bf_tab.h blowfish.h
+../blowfish.o: bf_tab.h blowfish.c blowfish.h ../module.h ../modvals.h \
+../../eggdrop.h
 	$(CC) $(CFLAGS) $(CPPFLAGS) -DMAKING_MODS -c blowfish.c
 	rm -f ../blowfish.o
 	mv blowfish.o ../
diff -urNPX ../exclude ../eggdrop1.3.tmp/src/mod/channels.mod/Makefile ./src/mod/channels.mod/Makefile
--- ../eggdrop1.3.tmp/src/mod/channels.mod/Makefile	Mon Oct 25 21:24:46 1999
+++ ./src/mod/channels.mod/Makefile	Mon Oct 25 18:00:49 1999
@@ -13,8 +13,8 @@
 
 modules: ../../../channels.so
 
-../channels.o: ../module.h ../modvals.h ../../eggdrop.h cmdschan.c tclchan.c \
-userchan.c channels.h
+../channels.o: channels.c channels.h cmdschan.c tclchan.c userchan.c \
+../module.h ../modvals.h ../../eggdrop.h
 	$(CC) $(CFLAGS) $(CPPFLAGS) -DMAKING_MODS -c channels.c
 	rm -f ../channels.o
 	mv channels.o ../
diff -urNPX ../exclude ../eggdrop1.3.tmp/src/mod/console.mod/Makefile ./src/mod/console.mod/Makefile
--- ../eggdrop1.3.tmp/src/mod/console.mod/Makefile	Mon Oct 25 21:24:46 1999
+++ ./src/mod/console.mod/Makefile	Mon Oct 25 18:04:33 1999
@@ -13,7 +13,7 @@
 
 modules: ../../../console.so
 
-../console.o: ../module.h ../modvals.h ../../eggdrop.h
+../console.o: console.c ../module.h ../modvals.h ../../eggdrop.h
 	$(CC) $(CFLAGS) $(CPPFLAGS) -DMAKING_MODS -c console.c
 	rm -f ../console.o
 	mv console.o ../
diff -urNPX ../exclude ../eggdrop1.3.tmp/src/mod/ctcp.mod/Makefile ./src/mod/ctcp.mod/Makefile
--- ../eggdrop1.3.tmp/src/mod/ctcp.mod/Makefile	Mon Oct 25 21:24:46 1999
+++ ./src/mod/ctcp.mod/Makefile	Mon Oct 25 18:00:06 1999
@@ -13,7 +13,7 @@
 
 modules: ../../../ctcp.so
 
-../ctcp.o: ../module.h ../modvals.h ../../eggdrop.h ctcp.h \
+../ctcp.o: ctcp.c ctcp.h ../module.h ../modvals.h ../../eggdrop.h \
 ../server.mod/server.h
 	$(CC) $(CFLAGS) $(CPPFLAGS) -DMAKING_MODS -c ctcp.c
 	rm -f ../ctcp.o
diff -urNPX ../exclude ../eggdrop1.3.tmp/src/mod/filesys.mod/Makefile ./src/mod/filesys.mod/Makefile
--- ../eggdrop1.3.tmp/src/mod/filesys.mod/Makefile	Mon Oct 25 21:24:46 1999
+++ ./src/mod/filesys.mod/Makefile	Mon Oct 25 18:04:16 1999
@@ -13,8 +13,8 @@
 
 modules: ../../../filesys.so
 
-../filesys.o: ../module.h ../modvals.h ../../eggdrop.h filedb.c \
-files.c tclfiles.c files.h filesys.h ../../lang.h ../../tandem.h \
+../filesys.o: filedb.c files.c files.h filesys.c filesys.h tclfiles.c \
+../module.h ../modvals.h ../../eggdrop.h ../../lang.h ../../tandem.h \
 ../transfer.mod/transfer.h
 	$(CC) $(CFLAGS) $(CPPFLAGS) -DMAKING_MODS -c filesys.c
 	rm -f ../filesys.o
diff -urNPX ../exclude ../eggdrop1.3.tmp/src/mod/irc.mod/Makefile ./src/mod/irc.mod/Makefile
--- ../eggdrop1.3.tmp/src/mod/irc.mod/Makefile	Mon Oct 25 21:24:46 1999
+++ ./src/mod/irc.mod/Makefile	Mon Oct 25 17:59:41 1999
@@ -13,8 +13,9 @@
 
 modules: ../../../irc.so
 
-../irc.o: ../module.h ../modvals.h ../../eggdrop.h chan.c cmdsirc.c mode.c \
-msgcmds.c tclirc.c irc.h ../channels.mod/channels.h ../server.mod/server.h
+../irc.o: chan.c cmdsirc.c irc.c irc.h mode.c msgcmds.c tclirc.c \
+../module.h ../modvals.h ../../eggdrop.h ../channels.mod/channels.h \
+../server.mod/server.h
 	$(CC) $(CFLAGS) $(CPPFLAGS) -DMAKING_MODS -c irc.c
 	rm -f ../irc.o
 	mv irc.o ../
diff -urNPX ../exclude ../eggdrop1.3.tmp/src/mod/irc.mod/msgcmds.c ./src/mod/irc.mod/msgcmds.c
--- ../eggdrop1.3.tmp/src/mod/irc.mod/msgcmds.c	Sat Oct  2 17:31:19 1999
+++ ./src/mod/irc.mod/msgcmds.c	Mon Oct 25 21:38:43 1999
@@ -610,7 +610,7 @@
       }
     }
   }
-  putlog(LOG_CMDS, "*", "(%s!%s) !%s! failed OP", nick, host, nick);
+  putlog(LOG_CMDS, "*", "(%s!%s) !*! failed OP", nick, host);
   return 1;
 }
 
@@ -658,7 +658,7 @@
       }
     }
   }
-  putlog(LOG_CMDS, "*", "(%s!%s) !%s! failed KEY", nick, host, nick);
+  putlog(LOG_CMDS, "*", "(%s!%s) !*! failed KEY", nick, host);
   return 1;
 }
 
@@ -699,7 +699,7 @@
       }
     }
   }
-  putlog(LOG_CMDS, "*", "(%s!%s) !%s! failed VOICE", nick, host, nick);
+  putlog(LOG_CMDS, "*", "(%s!%s) !*! failed VOICE", nick, host);
   return 1;
 }
 
@@ -928,7 +928,7 @@
       return 1;
     }
   } else {
-    putlog(LOG_CMDS, "*", "(%s!%s) !*! failed RESET", nick, host, u->handle);
+    putlog(LOG_CMDS, "*", "(%s!%s) !*! failed RESET", nick, host);
     if (!quiet_reject)
       dprintf(DP_HELP, "NOTICE %s :%s\n", nick, IRC_NOPASS);
     return 1;
diff -urNPX ../exclude ../eggdrop1.3.tmp/src/mod/notes.mod/Makefile ./src/mod/notes.mod/Makefile
--- ../eggdrop1.3.tmp/src/mod/notes.mod/Makefile	Mon Oct 25 21:24:46 1999
+++ ./src/mod/notes.mod/Makefile	Mon Oct 25 18:03:24 1999
@@ -13,8 +13,8 @@
 
 modules: ../../../notes.so
 
-../notes.o: ../module.h ../modvals.h ../../eggdrop.h cmdsnote.c notes.c \
-notes.h ../../tandem.h
+../notes.o: cmdsnote.c notes.c notes.h ../module.h ../modvals.h \
+../../eggdrop.h ../../tandem.h
 	$(CC) $(CFLAGS) $(CPPFLAGS) -DMAKING_MODS -c notes.c
 	rm -f ../notes.o
 	mv notes.o ../
diff -urNPX ../exclude ../eggdrop1.3.tmp/src/mod/seen.mod/Makefile ./src/mod/seen.mod/Makefile
--- ../eggdrop1.3.tmp/src/mod/seen.mod/Makefile	Mon Oct 25 21:24:46 1999
+++ ./src/mod/seen.mod/Makefile	Mon Oct 25 17:58:40 1999
@@ -13,7 +13,7 @@
 
 modules: ../../../seen.so
 
-../seen.o: ../module.h ../modvals.h ../../eggdrop.h \
+../seen.o: seen.c ../module.h ../modvals.h ../../eggdrop.h \
 ../channels.mod/channels.h ../../chan.h ../../users.h
 	$(CC) $(CFLAGS) $(CPPFLAGS) -DMAKING_MODS -c seen.c
 	rm -f ../seen.o
diff -urNPX ../exclude ../eggdrop1.3.tmp/src/mod/server.mod/Makefile ./src/mod/server.mod/Makefile
--- ../eggdrop1.3.tmp/src/mod/server.mod/Makefile	Mon Oct 25 21:24:46 1999
+++ ./src/mod/server.mod/Makefile	Mon Oct 25 18:02:42 1999
@@ -13,8 +13,8 @@
 
 modules: ../../../server.so
 
-../server.o: ../module.h ../modvals.h ../../eggdrop.h cmdsserv.c server.c \
-servmsg.c server.h
+../server.o: cmdsserv.c server.c server.h servmsg.c ../module.h \
+../modvals.h ../../eggdrop.h
 	$(CC) $(CFLAGS) $(CPPFLAGS) -DMAKING_MODS -c server.c
 	rm -f ../server.o
 	mv server.o ../
diff -urNPX ../exclude ../eggdrop1.3.tmp/src/mod/share.mod/Makefile ./src/mod/share.mod/Makefile
--- ../eggdrop1.3.tmp/src/mod/share.mod/Makefile	Mon Oct 25 21:24:46 1999
+++ ./src/mod/share.mod/Makefile	Mon Oct 25 18:06:05 1999
@@ -13,7 +13,7 @@
 
 modules: ../../../share.so
 
-../share.o: ../module.h ../modvals.h ../../eggdrop.h share.c ../../chan.h \
+../share.o: share.c ../module.h ../modvals.h ../../eggdrop.h ../../chan.h \
 ../../users.h ../channels.mod/channels.h ../transfer.mod/transfer.h
 	$(CC) $(CFLAGS) $(CPPFLAGS) -DMAKING_MODS -c share.c
 	rm -f ../share.o
diff -urNPX ../exclude ../eggdrop1.3.tmp/src/mod/transfer.mod/Makefile ./src/mod/transfer.mod/Makefile
--- ../eggdrop1.3.tmp/src/mod/transfer.mod/Makefile	Mon Oct 25 21:24:46 1999
+++ ./src/mod/transfer.mod/Makefile	Mon Oct 25 18:06:58 1999
@@ -13,8 +13,8 @@
 
 modules: ../../../transfer.so
 
-../transfer.o: ../module.h ../modvals.h ../../eggdrop.h transfer.h \
-../../tandem.h ../../users.h
+../transfer.o: transfer.c transfer.h ../module.h ../modvals.h \
+../../eggdrop.h ../../tandem.h ../../users.h
 	$(CC) $(CFLAGS) $(CPPFLAGS) -DMAKING_MODS -c transfer.c
 	rm -f ../transfer.o
 	mv transfer.o ../
diff -urNPX ../exclude ../eggdrop1.3.tmp/src/mod/wire.mod/Makefile ./src/mod/wire.mod/Makefile
--- ../eggdrop1.3.tmp/src/mod/wire.mod/Makefile	Mon Oct 25 21:24:46 1999
+++ ./src/mod/wire.mod/Makefile	Mon Oct 25 18:05:39 1999
@@ -13,7 +13,7 @@
 
 modules: ../../../wire.so
 
-../wire.o: ../module.h ../modvals.h ../../eggdrop.h wire.c wire.h \
+../wire.o: wire.c wire.h ../module.h ../modvals.h ../../eggdrop.h \
 ../../chan.h ../../users.h
 	$(CC) $(CFLAGS) $(CPPFLAGS) -DMAKING_MODS -c wire.c
 	rm -f ../wire.o
diff -urNPX ../exclude ../eggdrop1.3.tmp/src/mod/woobie.mod/Makefile ./src/mod/woobie.mod/Makefile
--- ../eggdrop1.3.tmp/src/mod/woobie.mod/Makefile	Mon Oct 25 21:24:46 1999
+++ ./src/mod/woobie.mod/Makefile	Mon Oct 25 18:01:25 1999
@@ -13,7 +13,7 @@
 
 modules: ../../../woobie.so
 
-../woobie.o: ../module.h ../modvals.h ../../eggdrop.h
+../woobie.o: woobie.c ../module.h ../modvals.h ../../eggdrop.h
 	$(CC) $(CFLAGS) $(CPPFLAGS) -DMAKING_MODS -c woobie.c
 	rm -f ../woobie.o
 	mv woobie.o ../


More information about the Patches mailing list