Tweak build, get "make install" working

Signed-off-by: John Else <john.else@citrix.com>