Log Message:
grafana/Makefile: revert rev 1.6-1.7

Actual problem was that EXTRACT_SUFX must be set earlier for intended
Makefile variable expansion.
It used to be set but got lost in the 4.6.2 update commit.