[cvs-nhc98] Fix hmake and hmake-config to work properly when built wit