--- Makefile.in.orig	2017-05-04 17:29:17.000000000 +1000
+++ Makefile.in	2020-07-05 18:49:48.000000000 +1000
@@ -483,7 +508,8 @@
 ACLOCAL_AMFLAGS = -I m4
 EXTRA_DIST = bootstrap COPYING KEYDB.cfg README.txt ChangeLog
 SET_INCLUDES = -I$(top_srcdir)/src -I$(top_builddir)/src/libaacs
-AM_CFLAGS = -std=c99 $(SET_FEATURES) $(SET_INCLUDES) $(LIBGCRYPT_CFLAGS) $(GPG_ERROR_CFLAGS)
+AM_CFLAGS = -std=c99 $(LIBGCRYPT_CFLAGS) $(GPG_ERROR_CFLAGS)
+AM_CPPFLAGS = $(SET_FEATURES) $(SET_INCLUDES)
 AM_YFLAGS = -d -p libaacs_yy
 lib_LTLIBRARIES = libaacs.la
 libaacs_la_SOURCES = src/libaacs/aacs.h src/libaacs/aacs.c \