Correct "touch" options
Expand make variables later