Fix issue with $(1) in Build/Configure/Default