--- configure.ac
+++ configure.ac
@@ -8,6 +8,8 @@
 AC_CANONICAL_HOST
 HOST_OS="$host_os"
 AC_SUBST(HOST_OS)
+HOST_CPU="$host_cpu"
+AC_SUBST(HOST_CPU)
 
 dnl Checks for programs.
 AC_PROG_CC
@@ -84,7 +86,7 @@
 dnl of libelf and ltrace matches.
 AC_SYS_LARGEFILE
 fi
-AC_OUTPUT(Makefile testsuite/Makefile \
+AC_OUTPUT(Makefile sysdeps/linux-gnu/Makefile testsuite/Makefile \
 	  testsuite/ltrace.main/Makefile testsuite/ltrace.minor/Makefile \
 	  testsuite/ltrace.torture/Makefile )