Better patch for DATADIRNAME to follow what we do everywhere else in-tree. Fix indentation. Tighten LIB_DEPENDS.