Fix Makefile variable name and make use of variables to simplify client/Makefile