Modify makefiles to remove hardcoded userdirs.