bughz/3proxy
1
0
Fork 0
mirror of https://github.com/3proxy/3proxy.git synced 2025-02-22 18:15:41 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Correct install scripts to take binaries from bin/

Browse Source
This commit is contained in:
z3APA3A 2018-04-23 02:24:24 +03:00
parent b7c667a682
commit 8d36bb6453
6 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.FreeBSD
View File

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

16
Makefile.Linux
View File

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

4
Makefile.unix
View File

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

16
Makefile.unix-install
View File

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

2
scripts/3proxy-linux-install.sh
View File

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

4
scripts/install-unix.sh
View File

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