build: Unbreak out of tree builds

2024-11-24 09:29:46 +03:00 · 2022-02-21 00:40:15 +01:00 · 2022-02-21 00:40:15 +01:00 · c5d61e4ec6
commit c5d61e4ec6
parent 8cae79abb7
5 changed files with 4 additions and 3 deletions
--- a/.gitignore
+++ b/.gitignore
@ -31,7 +31,7 @@
 /config.log
 /autom4te.cache
 /GNUmakefile
-/common/config.h
+/config.h
 /common-bios
 /common-uefi32
 /common-uefi64
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@ -197,7 +197,7 @@ dist:

 .PHONY: distclean
 distclean: clean
-	rm -rf toolchain ovmf* config.log config.status GNUmakefile common/config.h
+	rm -rf toolchain ovmf* config.log config.status GNUmakefile config.h

 .PHONY: maintainer-clean
 maintainer-clean: distclean
--- a/common/GNUmakefile
+++ b/common/GNUmakefile
@ -63,6 +63,7 @@ override INTERNAL_CFLAGS := \
 	-DCOM_OUTPUT=$(COM_OUTPUT) \
 	-DE9_OUTPUT=$(E9_OUTPUT) \
 	-I../freestanding_headers \
+	-I'$(call SHESCAPE,$(BUILDDIR))/..' \
 	-I. \
 	-I../stivale \
 	-I'$(call SHESCAPE,$(BUILDDIR))/tinf'
--- a/common/config.h.in
+++ b/common/config.h.in
--- a/configure.ac
+++ b/configure.ac
@ -237,5 +237,5 @@ AC_SUBST(LIMINE_COPYRIGHT, [$LIMINE_COPYRIGHT])

 AC_PREFIX_DEFAULT(/usr/local)

-AC_CONFIG_FILES(GNUmakefile common/config.h)
+AC_CONFIG_FILES(GNUmakefile config.h)
 AC_OUTPUT