Fixing /usr versus /usr/local dilemmas