Post merge fix: adapt xf86-video-intel's Makefile (in src/external).