tjh.dev
1diff --git a/configure.ac b/configure.ac
2index 4ffb68f..d8a8265 100644
3--- a/configure.ac
4+++ b/configure.ac
5@@ -71,15 +71,16 @@ AM_CONDITIONAL(TEST_BINARY_FORMAT, [ test "$EFI_ARCH" = "arm" -o "$EFI_ARCH" = "
6 # no consistent view of where gnu-efi should dump the efi stuff, so find it
7 ##
8 for path in /lib /lib64 /usr/lib /usr/lib64 /usr/lib32 /lib/efi /lib64/efi /usr/lib/efi /usr/lib64/efi /usr/lib/gnuefi /usr/lib64/gnuefi ; do
9- if test -e $path/crt0-efi-$EFI_ARCH.o; then
10- CRTPATH=$path
11+ if test -e @@NIX_GNUEFI@@/$path/crt0-efi-$EFI_ARCH.o; then
12+ CRTPATH=@@NIX_GNUEFI@@/$path
13+ break
14 fi
15 done
16 if test -z "$CRTPATH"; then
17 AC_MSG_ERROR([cannot find the gnu-efi crt path])
18 fi
19
20-EFI_CPPFLAGS="-I/usr/include/efi -I/usr/include/efi/$EFI_ARCH \
21+EFI_CPPFLAGS="-I@@NIX_GNUEFI@@/include/efi -I@@NIX_GNUEFI@@/include/efi/$EFI_ARCH \
22 -DEFI_FUNCTION_WRAPPER"
23 CPPFLAGS_save="$CPPFLAGS"
24 CPPFLAGS="$CPPFLAGS $EFI_CPPFLAGS"
25@@ -90,5 +91,5 @@ AC_SUBST(EFI_ARCH, $EFI_ARCH)
26 AC_SUBST(CRTPATH, $CRTPATH)
27
28 AC_CONFIG_FILES([Makefile src/Makefile lib/ccan/Makefile]
29- [docs/Makefile tests/Makefile])
30+ [docs/Makefile])
31 AC_OUTPUT