Merge branch 'fixes for bpftool's Makefile'

Quentin Monnet says:


This set contains one fix for bpftool's Makefile, to make sure that the
headers internal to libbpf are installed properly even if we add more
headers to the relevant Makefile variable in the future (although we'd like
to avoid that if possible).

The other patches aim at cleaning up the output from the Makefile, in
particular when running the command "make" another time after bpftool is

Signed-off-by: Andrii Nakryiko <>