From 318fa0284704a1ac27e483c4e738d4b29fa64848 Mon Sep 17 00:00:00 2001 From: Alexander Regueiro Date: Sat, 21 Jan 2023 02:16:55 +0000 Subject: [PATCH 1/3] Do not try to install man1 pages (there are none) --- Makefile.Linux | 1 - Makefile.openwrt-mips | 1 - Makefile.unix-install | 3 --- 3 files changed, 5 deletions(-) diff --git a/Makefile.Linux b/Makefile.Linux index 4f3f2b3..ecdb325 100644 --- a/Makefile.Linux +++ b/Makefile.Linux @@ -72,7 +72,6 @@ INSTALL_SYSTEMD_SCRIPT = scripts/3proxy.service CHROOTDIR = $(DESTDIR)$(chroot_prefix)/3proxy CHROOTREL = ../..$(chroot_prefix)/3proxy -MANDIR1 = $(DESTDIR)$(man_prefix)/man/man1 MANDIR3 = $(DESTDIR)$(man_prefix)/man/man3 MANDIR8 = $(DESTDIR)$(man_prefix)/man/man8 BINDIR = $(DESTDIR)$(exec_prefix)/bin diff --git a/Makefile.openwrt-mips b/Makefile.openwrt-mips index 33856f1..a0ce256 100644 --- a/Makefile.openwrt-mips +++ b/Makefile.openwrt-mips @@ -66,7 +66,6 @@ INSTALL_CFG_DEST = config INSTALL_CFG_OBJS2 = passwd counters bandlimiters -MANDIR1 = $(DESTDIR)$(man_prefix)/man/man1 MANDIR3 = $(DESTDIR)$(man_prefix)/man/man3 MANDIR8 = $(DESTDIR)$(man_prefix)/man/man8 BINDIR = $(DESTDIR)$(exec_prefix)/bin diff --git a/Makefile.unix-install b/Makefile.unix-install index d9c8fe0..162303f 100644 --- a/Makefile.unix-install +++ b/Makefile.unix-install @@ -21,7 +21,6 @@ INSTALL_CFG_DEST = config INSTALL_CFG_OBJS2 = passwd counters bandlimiters -MANDIR1 = $(DESTDIR)$(man_prefix)/man/man1 MANDIR3 = $(DESTDIR)$(man_prefix)/man/man3 MANDIR8 = $(DESTDIR)$(man_prefix)/man/man8 BINDIR = $(DESTDIR)$(exec_prefix)/bin @@ -48,10 +47,8 @@ install-etc: install-etc-dir done; install-man: - $(INSTALL_BIN) -d $(MANDIR1) $(INSTALL_BIN) -d $(MANDIR3) $(INSTALL_BIN) -d $(MANDIR8) - $(INSTALL_DATA) man/*.1 $(MANDIR1) $(INSTALL_DATA) man/*.3 $(MANDIR3) $(INSTALL_DATA) man/*.8 $(MANDIR8) From a2f804a65a9b907e0411acd3745297003044d324 Mon Sep 17 00:00:00 2001 From: Alexander Regueiro Date: Sat, 21 Jan 2023 02:25:43 +0000 Subject: [PATCH 2/3] Remove `install` target specific to FreeBSD --- Makefile.FreeBSD | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/Makefile.FreeBSD b/Makefile.FreeBSD index 5ab96e0..5ed95c4 100644 --- a/Makefile.FreeBSD +++ b/Makefile.FreeBSD @@ -33,23 +33,7 @@ PLUGINS = StringsPlugin TrafficPlugin PCREPlugin PamAuth TransparentPlugin include Makefile.inc -install: all - if [ ! -d /usr/local/3proxy/bin ]; then mkdir -p /usr/local/3proxy/bin/; fi - install bin/3proxy /usr/local/3proxy/bin/3proxy - install bin/mycrypt /usr/local/3proxy/bin/mycrypt - install scripts/add3proxyuser.sh /usr/local/3proxy/bin/ - if [ -s /usr/local/etc/3proxy/3proxy.cfg ]; then - echo /usr/local/3proxy/3proxy.cfg already exists - else - install scripts/3proxy.cfg /usr/local/etc/3proxy/ - if [ ! -d /var/log/3proxy/ ]; then - mkdir /var/log/3proxy/ - fi - touch /usr/local/3proxy/passwd - touch /usr/local/3proxy/counters - touch /usr/local/3proxy/bandlimiters - echo Run /usr/local/3proxy/bin/add3proxyuser.sh to add \'admin\' user - fi +DESTDIR = allplugins: @list='$(PLUGINS)'; for p in $$list; do cp Makefile Makefile.var plugins/$$p; cd plugins/$$p ; make ; cd ../.. ; done From 68aba1841037eca58f37f4c0d491bc27652b4945 Mon Sep 17 00:00:00 2001 From: Alexander Regueiro Date: Sat, 21 Jan 2023 03:15:59 +0000 Subject: [PATCH 3/3] Add missing semicolon This was causing an error on macOS. --- Makefile.unix-install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.unix-install b/Makefile.unix-install index 162303f..2e9d652 100644 --- a/Makefile.unix-install +++ b/Makefile.unix-install @@ -37,7 +37,7 @@ install-etc-default-config: if [ -f $(ETCDIR)/$(INSTALL_CFG_DEST) ]; then \ : ; \ else \ - $(INSTALL_DATA) $(INSTALL_CFG_OBJS) $(ETCDIR)/$(INSTALL_CFG_DEST) \ + $(INSTALL_DATA) $(INSTALL_CFG_OBJS) $(ETCDIR)/$(INSTALL_CFG_DEST) ; \ fi install-etc: install-etc-dir