Correct install scripts to take binaries from bin/

Makefile.FreeBSD

@@ -37,8 +37,8 @@ include Makefile.inc
 
 install: all
 	if [ ! -d /usr/local/etc/3proxy/bin ]; then mkdir -p /usr/local/etc/3proxy/bin/; fi
-	install src/3proxy /usr/local/etc/3proxy/bin/3proxy
-	install src/mycrypt /usr/local/etc/3proxy/bin/mycrypt
+	install bin/3proxy /usr/local/etc/3proxy/bin/3proxy
+	install bin/mycrypt /usr/local/etc/3proxy/bin/mycrypt
 	install scripts/rc.d/proxy.sh /usr/local/etc/rc.d/proxy.sh
 	install scripts/add3proxyuser.sh /usr/local/etc/3proxy/bin/
 	if [ -s /usr/local/etc/3proxy/3proxy.cfg ]; then

Makefile.Linux

@@ -49,14 +49,14 @@ man_prefix	= $(prefix)/share
 INSTALL		= /usr/bin/install
 INSTALL_BIN	= $(INSTALL) -m 755
 INSTALL_DATA	= $(INSTALL) -m 644
-INSTALL_OBJS	= src/3proxy \
-		  src/ftppr \
-		  src/mycrypt \
-		  src/pop3p \
-		  src/proxy \
-		  src/socks \
-		  src/tcppm \
-		  src/udppm
+INSTALL_OBJS	= bin/3proxy \
+		  bin/ftppr \
+		  bin/mycrypt \
+		  bin/pop3p \
+		  bin/proxy \
+		  bin/socks \
+		  bin/tcppm \
+		  bin/udppm
 		  
 
 INSTALL_CFG_OBJS = scripts/3proxy.cfg \

Makefile.unix

@@ -38,8 +38,8 @@ include Makefile.inc
 
 install: all
 	if [ ! -d /usr/local/etc/3proxy/bin ]; then mkdir -p /usr/local/etc/3proxy/bin/; fi
-	install src/3proxy /usr/local/etc/3proxy/bin/3proxy
-	install src/mycrypt /usr/local/etc/3proxy/bin/mycrypt
+	install bin/3proxy /usr/local/etc/3proxy/bin/3proxy
+	install bin/mycrypt /usr/local/etc/3proxy/bin/mycrypt
 	install scripts/rc.d/proxy.sh /usr/local/etc/rc.d/proxy.sh
 	install scripts/add3proxyuser.sh /usr/local/etc/3proxy/bin/
 	if [ -s /usr/local/etc/3proxy/3proxy.cfg ]; then

Makefile.unix-install

@@ -6,14 +6,14 @@ man_prefix	= $(prefix)/share
 INSTALL		= /usr/bin/install
 INSTALL_BIN	= $(INSTALL) -m 755
 INSTALL_DATA	= $(INSTALL) -m 644
-INSTALL_OBJS	= src/3proxy \
-		  src/ftppr \
-		  src/mycrypt \
-		  src/pop3p \
-		  src/proxy \
-		  src/socks \
-		  src/tcppm \
-		  src/udppm \
+INSTALL_OBJS	= bin/3proxy \
+		  bin/ftppr \
+		  bin/mycrypt \
+		  bin/pop3p \
+		  bin/proxy \
+		  bin/socks \
+		  bin/tcppm \
+		  bin/udppm \
 		  scripts/add3proxyuser.sh
 
 INSTALL_CFG_OBJS = scripts/3proxy.cfg

scripts/3proxy-linux-install.sh

@@ -225,7 +225,7 @@ BinInstall()
 	local binlist
 	local liblist
 	
-	cd src
+	cd bin
 	
 	binlist=`ls -l --time-style="+%d.%m.%Y %H:%m" | awk '$1 ~ /x$/ && $1 ~ /^[^d]/ && $8 !~ /\.so$/ { print $8 }'`
 	

scripts/install-unix.sh

@@ -3,8 +3,8 @@ cd ..
 cp Makefile.unix Makefile
 make
 if [ ! -d /usr/local/etc/3proxy/bin ]; then mkdir -p /usr/local/etc/3proxy/bin/; fi
-install src/3proxy /usr/local/etc/3proxy/bin/3proxy
-install src/mycrypt /usr/local/etc/3proxy/bin/mycrypt
+install bin/3proxy /usr/local/etc/3proxy/bin/3proxy
+install bin/mycrypt /usr/local/etc/3proxy/bin/mycrypt
 install scripts/rc.d/proxy.sh /usr/local/etc/rc.d/proxy.sh
 install scripts/add3proxyuser.sh /usr/local/etc/3proxy/bin/
 if [ -s /usr/local/etc/3proxy/3proxy.cfg ]; then