made 'current' target dir configurable
proper includes
added parnetesis to avoid -Wparenthesis