Added PKG_CPE_ID for proper CVE tracking. Some Makefile rearrangements for consistency. Signed-off-by: Rosen Penev <rosenp@gmail.com>