diff --git a/Makefile.FreeBSD b/Makefile.FreeBSD index 0eb8774..2defd08 100644 --- a/Makefile.FreeBSD +++ b/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 diff --git a/Makefile.Linux b/Makefile.Linux index 3317bd9..e4a0a0c 100644 --- a/Makefile.Linux +++ b/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 \ diff --git a/Makefile.unix b/Makefile.unix index 954e5d0..9f6ab5b 100644 --- a/Makefile.unix +++ b/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 diff --git a/Makefile.unix-install b/Makefile.unix-install index 5cd80f8..d9c8fe0 100644 --- a/Makefile.unix-install +++ b/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 diff --git a/scripts/3proxy-linux-install.sh b/scripts/3proxy-linux-install.sh index a01d18e..3871655 100644 --- a/scripts/3proxy-linux-install.sh +++ b/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 }'` diff --git a/scripts/install-unix.sh b/scripts/install-unix.sh index 9fc5d42..11a4788 100644 --- a/scripts/install-unix.sh +++ b/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