Fixes compilation with GCC11. Reorganized Makefile variables for consistency between packages. Signed-off-by: Rosen Penev <rosenp@gmail.com>