Fix packaging errors in makefiles