Minor make install changes

This commit is contained in:
z3APA3A 2019-02-21 17:44:11 +03:00
parent e07054e8d0
commit b88d07a1a7

View File

@ -74,8 +74,10 @@ MANDIR8 = $(DESTDIR)$(man_prefix)/man/man8
BINDIR = $(DESTDIR)$(exec_prefix)/bin BINDIR = $(DESTDIR)$(exec_prefix)/bin
ETCDIR = $(DESTDIR)$(prefix)/etc/3proxy ETCDIR = $(DESTDIR)$(prefix)/etc/3proxy
INITDDIR = $(DESTDIR)$(prefix)/etc/init.d INITDDIR = $(DESTDIR)$(prefix)/etc/init.d
RUNDIR = $(DESTDIR)$(prefix)/var/run/3proxy RUNBASE = $(DESTDIR)$(prefix)/var/run
LOGDIR = $(DESTDIR)$(prefix)/var/log/3proxy RUNDIR = $(RUNBASE)/3proxy
LOGBASE = $(DESTDIR)$(prefix)/var/log
LOGDIR = $(LOGBASE)/3proxy
INSTALL_CFG_DEST = $(ETCDIR)/conf INSTALL_CFG_DEST = $(ETCDIR)/conf
install-bin: install-bin:
@ -115,7 +117,7 @@ install-man:
$(INSTALL_DATA) man/*.8 $(MANDIR8) $(INSTALL_DATA) man/*.8 $(MANDIR8)
install-init: install-init:
if [ -f $(INITDIR) ]; then \ if [ -d $(INITDIR) ]; then \
$(INSTALL_BIN) $(INSTALL_INITD_SCRIPT) $(INITDDIR)/3proxy; \ $(INSTALL_BIN) $(INSTALL_INITD_SCRIPT) $(INITDDIR)/3proxy; \
fi fi
if [ -f /usr/sbin/update-rc.d ]; then \ if [ -f /usr/sbin/update-rc.d ]; then \
@ -127,9 +129,11 @@ install-run:
$(INSTALL_BIN) -d $(RUNDIR) $(INSTALL_BIN) -d $(RUNDIR)
install-log: install-log:
@if [ -d $(LOGBASE) ]; then \
@if [ ! -d $(LOGDIR) ]; then \ @if [ ! -d $(LOGDIR) ]; then \
ln -s $(CHROOTDIR)/logs $(LOGDIR);\ ln -s $(CHROOTDIR)/logs $(LOGDIR);\
fi fi
fi
install: install-chroot-dir install-bin install-etc install-log install-man install-run install-init install: install-chroot-dir install-bin install-etc install-log install-man install-run install-init
@getent passwd proxy || useradd -UMr -s /bin/false -c 3proxy proxy @getent passwd proxy || useradd -UMr -s /bin/false -c 3proxy proxy
@ -155,7 +159,7 @@ install: install-chroot-dir install-bin install-etc install-log install-man inst
@echo to add users @echo to add users
@echo "" @echo ""
@echo Default config uses Google\'s DNS. @echo Default config uses Google\'s DNS.
@echo It\'s recommended to uss provider supplied DNS or install local recursor, e.g. pdns-recursor. @echo It\'s recommended to use provider supplied DNS or install local recursor, e.g. pdns-recursor.
@echo Configure preferred DNS in $(INSTALL_CFG_DEST)/3proxy.cfg. @echo Configure preferred DNS in $(INSTALL_CFG_DEST)/3proxy.cfg.
@if [ -f /usr/sbin/service ]; then \ @if [ -f /usr/sbin/service ]; then \
/usr/sbin/service 3proxy stop ;\ /usr/sbin/service 3proxy stop ;\