diff --git a/haproxy/Makefile b/haproxy/Makefile index f9d5a30..3e3b535 100644 --- a/haproxy/Makefile +++ b/haproxy/Makefile @@ -76,6 +76,7 @@ patches: $(HAPROXY_BUILDIR) build: $(HAPROXY_BUILDIR) patches $(MAKE) build_$(shell uname -s) + if [ -d "$(HAPROXY_BUILDIR)/dev/haring" ]; then $(MAKE) -C "$(HAPROXY_BUILDIR)" -j "$(shell nproc)" dev/haring/haring; fi .PHONY: build_Linux build_Linux: @@ -98,6 +99,7 @@ $(HAPROXY_DESTDIR): @if [ -d "$(HAPROXY_DESTDIR)" ]; then rm -rf $(HAPROXY_DESTDIR); fi @mkdir -pv "$(HAPROXY_DESTDIR)" $(MAKE) -C "$(HAPROXY_BUILDIR)" -j "$(shell nproc)" DESTDIR="$(HAPROXY_DESTDIR_ABS)" install + if [ -f "$(HAPROXY_BUILDIR)/dev/haring/haring" ]; then install -m 0755 -D "$(HAPROXY_BUILDIR)/dev/haring/haring" "$(HAPROXY_DESTDIR_ABS)/usr/local/sbin/haring"; fi $(HAPROXY_DESTDIR_ABS)/usr/local/sbin/haproxy -vv $(HAPROXY_ARCHIVE): $(HAPROXY_DESTDIR) diff --git a/haproxy/debian/rules b/haproxy/debian/rules index 717cbd3..684d4e3 100755 --- a/haproxy/debian/rules +++ b/haproxy/debian/rules @@ -49,6 +49,7 @@ override_dh_auto_configure: override_dh_auto_build-arch: $(MAKE) -j $(shell nproc) $(MAKEARGS) + if [ -d "dev/haring" ]; then $(MAKE) -j $(shell nproc) dev/haring/haring; fi $(MAKE) -j $(shell nproc) -C admin/systemd $(MAKEARGS) override_dh_auto_clean: @@ -58,6 +59,7 @@ override_dh_auto_clean: override_dh_auto_install-arch: cp -rf $(DEP_DIST_ROOT_QUICTLS)/opt debian/haproxy/opt $(MAKE) -j $(shell nproc) $(MAKEARGS) install + if [ -f "dev/haring/haring" ]; then install -m 0755 -D dev/haring/haring debian/haproxy/usr/sbin/haring; fi install -m 0644 -D debian/rsyslog.conf debian/haproxy/etc/rsyslog.d/49-haproxy.conf install -m 0644 -D debian/logrotate.conf debian/haproxy/etc/logrotate.d/haproxy