CBD-1108:  move make variable substitution to within make command

Change-Id: Ide1f4218f1c50efa944c343fa5bd2e7dddb6f54f