- Pull in the appropriate $(GhcStageNHcOpts)

- re-instate -I$(GHC_INCLUDE_DIR) in $(SRC_CC_OPTS) that I
  accidentally removed in rev. 1.226