BUILD: makefile: Fix install(1) handling for OpenBSD/NetBSD/Solaris/AIX
Add a new INSTALL variable to allow overridiing the flags passed to
install(1). install(1) on OpenBSD/NetBSD/Solaris/AIX does not support
the -v flag. With the new INSTALL variable and handling only use the
-v flag with the Linux targets.
(cherry picked from commit bc50e0d0fb2c86d67529553686ea4e3384952184)
Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>
(cherry picked from commit 71cef8e9c333b1913181c22f9e9d0d8d7bc8f543)
Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>
(cherry picked from commit 87f59549df7259e81d3d9dbce3def79154511a41)
Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>
diff --git a/Makefile b/Makefile
index e9c2c54..c0a6a27 100644
--- a/Makefile
+++ b/Makefile
@@ -83,6 +83,9 @@
# DESTDIR is not set by default and is used for installation only.
# It might be useful to set DESTDIR if you want to install haproxy
# in a sandbox.
+# INSTALL is set to "install" by default and is used to provide the name of
+# the install binary used by the install targets and any additional
+# flags.
# PREFIX is set to "/usr/local" by default and is used for installation only.
# SBINDIR is set to "$(PREFIX)/sbin" by default and is used for installation
# only.
@@ -148,6 +151,7 @@
#### Installation options.
DESTDIR =
+INSTALL = install
PREFIX = /usr/local
SBINDIR = $(PREFIX)/sbin
MANDIR = $(PREFIX)/share/man
@@ -356,6 +360,7 @@
USE_CPU_AFFINITY USE_THREAD USE_EPOLL USE_FUTEX USE_LINUX_TPROXY \
USE_ACCEPT4 USE_LINUX_SPLICE USE_PRCTL USE_THREAD_DUMP USE_NS USE_TFO \
USE_GETADDRINFO USE_BACKTRACE)
+ INSTALL = install -v
endif
# For linux >= 2.6.28, glibc without new features
@@ -364,6 +369,7 @@
USE_POLL USE_TPROXY USE_LIBCRYPT USE_DL USE_RT USE_CRYPT_H USE_NETFILTER \
USE_CPU_AFFINITY USE_THREAD USE_EPOLL USE_FUTEX USE_LINUX_TPROXY \
USE_ACCEPT4 USE_LINUX_SPLICE USE_PRCTL USE_THREAD_DUMP USE_GETADDRINFO)
+ INSTALL = install -v
endif
# For linux >= 2.6.28 and musl
@@ -373,6 +379,7 @@
USE_CPU_AFFINITY USE_THREAD USE_EPOLL USE_FUTEX USE_LINUX_TPROXY \
USE_ACCEPT4 USE_LINUX_SPLICE USE_PRCTL USE_THREAD_DUMP USE_NS USE_TFO \
USE_GETADDRINFO)
+ INSTALL = install -v
endif
# Solaris 10 and above
@@ -991,16 +998,16 @@
-c -o $@ $<
install-man:
- $(Q)install -v -d "$(DESTDIR)$(MANDIR)"/man1
- $(Q)install -v -m 644 doc/haproxy.1 "$(DESTDIR)$(MANDIR)"/man1
+ $(Q)$(INSTALL) -d "$(DESTDIR)$(MANDIR)"/man1
+ $(Q)$(INSTALL) -m 644 doc/haproxy.1 "$(DESTDIR)$(MANDIR)"/man1
EXCLUDE_DOCUMENTATION = lgpl gpl coding-style
DOCUMENTATION = $(filter-out $(EXCLUDE_DOCUMENTATION),$(patsubst doc/%.txt,%,$(wildcard doc/*.txt)))
install-doc:
- $(Q)install -v -d "$(DESTDIR)$(DOCDIR)"
+ $(Q)$(INSTALL) -d "$(DESTDIR)$(DOCDIR)"
$(Q)for x in $(DOCUMENTATION); do \
- install -v -m 644 doc/$$x.txt "$(DESTDIR)$(DOCDIR)" ; \
+ $(INSTALL) -m 644 doc/$$x.txt "$(DESTDIR)$(DOCDIR)" ; \
done
install-bin:
@@ -1010,8 +1017,8 @@
exit 1; \
fi; \
done
- $(Q)install -v -d "$(DESTDIR)$(SBINDIR)"
- $(Q)install -v haproxy $(EXTRA) "$(DESTDIR)$(SBINDIR)"
+ $(Q)$(INSTALL) -d "$(DESTDIR)$(SBINDIR)"
+ $(Q)$(INSTALL) haproxy $(EXTRA) "$(DESTDIR)$(SBINDIR)"
install: install-bin install-man install-doc