Conflict in HEAD between suffix.mk and config.mk.in

[Simon Marlow]

Reilly Hayes wrote:
>
> config.mk.in defines MANGLER while suffix.mk uses GHC_MANGLER.  I  have 
> changed suffix.mk in my build directory to use MANGLER, but  GHC_MANGLER 
> is more consistent with the variables used to construct  MANGLER 
> (GHC_MANGLER_DIR & GHC_MANGLER_PGM)

Fixed, thanks.

Simon