Fix libdir lookup
Checking in changes prior to tagging of version 1.11.3.