Revert "change user settings"

This reverts commit fd0e7dca70c3ca1c62c06b8f3268d47027d6670c.
Revert "add export OpenCV_DIR"

This reverts commit c0ded2e617355dbf887c969d73afead749a38e1a.
Darwinにおけるls -Lオプション指定解除漏れの修正
fix merge trouble