diff --git a/Changes b/Changes index 237443da1..0cad8e166 100644 --- a/Changes +++ b/Changes @@ -1598,3 +1598,7 @@ MOTDs stuff - #0003212 patched by Grunt, regarding /userip seemingly shows my (cloaked) IP +- #0003091,#0003068,#003290 reported by Bock, aegis, WolfSage and patched by aegis, regarding + Makefile.in includes networks* files/dirs, Problems when specifying + different directory for binary in Config, error on 'make install' if path + to binary not exist diff --git a/Config b/Config index 7c7ad812d..cf0e645b7 100755 --- a/Config +++ b/Config @@ -280,7 +280,7 @@ n="" UNREALCWD="`pwd`" NOSPOOF="" DPATH="`pwd`" -SPATH="`pwd`/src/ircd" +SPATH="`pwd`/src" HUB="1" DEFPERM="0600" CRYPTOIRCD="" @@ -412,7 +412,7 @@ done TEST="$DPATH" echo "" -echo "What directory are all the server configuration files in?" +echo "Where do you want to install the server configuration files?" echo $n "[$TEST] -> $c" read cc if [ -z "$cc" ] ; then @@ -423,7 +423,7 @@ fi TEST="$SPATH" echo "" -echo "What is the path to the ircd binary including the name of the binary?" +echo "Where do you want to install the server binary?" echo $n "[$TEST] -> $c" read cc if [ -z "$cc" ] ; then diff --git a/Makefile.in b/Makefile.in index 9e508986b..02d08c258 100644 --- a/Makefile.in +++ b/Makefile.in @@ -203,19 +203,15 @@ depend: install: all $(INSTALL) -m 0700 -d $(IRCDDIR) + $(INSTALL) -m 0700 -d $(BINDDIR) $(INSTALL) -m 0700 src/ircd $(BINDIR) - $(INSTALL) -m 0700 -d $(IRCDDIR)/networks - $(INSTALL) -m 0600 networks/*.network $(IRCDDIR)/networks - $(INSTALL) -m 0700 networks/makenet $(IRCDDIR)/networks - $(INSTALL) -m 0600 networks/networks.ndx $(IRCDDIR)/networks $(INSTALL) -m 0700 -d $(IRCDDIR)/doc $(INSTALL) -m 0600 doc/Authors doc/example.conf doc/coding-guidelines doc/tao.of.irc doc/unreal32docs.html $(IRCDDIR)/doc $(INSTALL) -m 0700 -d $(IRCDDIR)/aliases $(INSTALL) -m 0600 aliases/*.conf $(IRCDDIR)/aliases $(TOUCH) $(IRCDDIR)/unrealircd.conf chmod 0600 $(IRCDDIR)/unrealircd.conf - $(INSTALL) -m 0600 spamfilter.conf dccallow.conf $(IRCDDIR) - $(INSTALL) -m 0600 badwords.*.conf help.conf LICENSE Donation $(IRCDDIR) + $(INSTALL) -m 0600 *.conf help.conf LICENSE Donation $(IRCDDIR) $(INSTALL) -m 0700 unreal $(IRCDDIR) $(INSTALL) -m 0700 -d $(IRCDDIR)/modules $(INSTALL) -m 0700 src/modules/*.so $(IRCDDIR)/modules diff --git a/ircdcron/ircdchk.in b/ircdcron/ircdchk.in index 088927106..f211046c7 100644 --- a/ircdcron/ircdchk.in +++ b/ircdcron/ircdchk.in @@ -22,7 +22,7 @@ # These values shouldn't need to be changed # The path to the ircd binary -ircdexe="@BINDIR@" +ircdexe="@BINDIR@/ircd" # The path to the ircd pid file ircdname="@IRCDDIR@/ircd.pid" diff --git a/unreal.in b/unreal.in index 2d15a8b08..c01c2a0c9 100644 --- a/unreal.in +++ b/unreal.in @@ -7,7 +7,7 @@ if [ "$1" = "start" ] ; then if [ -r $PID_FILE ] ; then mv -f $PID_FILE $PID_BACKUP fi - @BINDIR@ + @BINDIR@/ircd sleep 1 if [ ! -r $PID_FILE ] ; then sleep 4 @@ -34,11 +34,11 @@ elif [ "$1" = "restart" ] ; then echo "Restarting UnrealIRCd" kill -2 `cat $PID_FILE` elif [ "$1" = "mkpasswd" ] ; then - @BINDIR@ -P $2 $3 + @BINDIR@/ircd -P $2 $3 elif [ "$1" = "version" ] ; then - @BINDIR@ -v + @BINDIR@/ircd -v elif [ "$1" = "configtest" ] ; then - @BINDIR@ -e + @BINDIR@/ircd -e elif [ "$1" = "backtrace" ] ; then cd @IRCDDIR@ @@ -93,7 +93,7 @@ elif [ "$1" = "backtrace" ] ; then fi # Some ugly prepare work -- ignore errors - (echo quit|gdb @BINDIR@ $corefile 2>&1)|\ + (echo quit|gdb @BINDIR@/ircd $corefile 2>&1)|\ grep -i 'no such file'|\ awk -F ':' '{ print $1 }'|sort|uniq|\ awk -F '.' "{ system(\"ln -s ../$modpath/\" \$2 \".so \" \$0) }" @@ -113,7 +113,7 @@ bt 3 full quit __EOF__ - gdb -batch -x gdb.commands @BINDIR@ $corefile + gdb -batch -x gdb.commands @BINDIR@/ircd $corefile rm -f gdb.commands echo "GCC: `gcc -v 2>&1|tail -n 1`" echo "UNAME: `uname -a`"