From 0196abf2ec375b1ff0f2bf466a7cffbf2d2bede8 Mon Sep 17 00:00:00 2001
From: mintsuki <mintsuki@protonmail.com>
Date: Thu, 23 Mar 2023 02:35:08 +0100
Subject: [PATCH] build: Minor build system updates

---
 .github/workflows/release.yml | 4 ++--
 common/GNUmakefile            | 1 -
 configure.ac                  | 4 ++++
 host/Makefile                 | 6 +++---
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 25b368ce..1fb3fca1 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -48,7 +48,7 @@ jobs:
         run: rm build/bin/limine-enroll-config
 
       - name: Build limine-enroll-config-win32
-        run: make -C build/bin CC="i686-w64-mingw32-gcc" CFLAGS="-O2 -pipe" limine-enroll-config
+        run: make -C build/bin CC="i686-w64-mingw32-gcc" CFLAGS="-O2 -pipe" CPPFLAGS="-D__USE_MINGW_ANSI_STDIO" limine-enroll-config
 
       - name: Strip limine-enroll-config-win32
         run: i686-w64-mingw32-strip build/bin/limine-enroll-config.exe
@@ -57,7 +57,7 @@ jobs:
         run: rm build/bin/limine-deploy
 
       - name: Build limine-deploy-win32
-        run: make -C build/bin CC="i686-w64-mingw32-gcc" CFLAGS="-O2 -pipe" limine-deploy
+        run: make -C build/bin CC="i686-w64-mingw32-gcc" CFLAGS="-O2 -pipe" CPPFLAGS="-D__USE_MINGW_ANSI_STDIO" limine-deploy
 
       - name: Strip limine-deploy-win32
         run: i686-w64-mingw32-strip build/bin/limine-deploy.exe
diff --git a/common/GNUmakefile b/common/GNUmakefile
index 67b3f53f..786a2c17 100644
--- a/common/GNUmakefile
+++ b/common/GNUmakefile
@@ -58,7 +58,6 @@ override CPPFLAGS_FOR_TARGET := \
     -I../freestanding-headers \
     -I'$(call SHESCAPE,$(BUILDDIR))/..' \
     -I. \
-    -I.. \
     $(CPPFLAGS_FOR_TARGET) \
     -DCOM_OUTPUT=$(COM_OUTPUT) \
     -DE9_OUTPUT=$(E9_OUTPUT) \
diff --git a/configure.ac b/configure.ac
index 30b8b575..060281ba 100644
--- a/configure.ac
+++ b/configure.ac
@@ -274,5 +274,9 @@ AC_SUBST([LIMINE_COPYRIGHT])
 
 AC_PREFIX_DEFAULT([/usr/local])
 
+if ! test "$SRCDIR" = "$BUILDDIR"; then
+    cp "$SRCDIR/limine.h" "$BUILDDIR/"
+fi
+
 AC_CONFIG_FILES([man/man1/limine-version.1 man/man1/limine-deploy.1 man/man1/limine-enroll-config.1 GNUmakefile config.h])
 AC_OUTPUT
diff --git a/host/Makefile b/host/Makefile
index ee46700f..ea33398a 100644
--- a/host/Makefile
+++ b/host/Makefile
@@ -39,10 +39,10 @@ clean:
 	rm -f limine-enroll-config limine-enroll-config.exe
 
 limine-deploy: limine-deploy.c limine-hdd.h
-	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -std=c99 -D__USE_MINGW_ANSI_STDIO limine-deploy.c $(LIBS) -o $@
+	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -std=c99 limine-deploy.c $(LIBS) -o $@
 
 limine-version: limine-version.c
-	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -std=c99 -D__USE_MINGW_ANSI_STDIO limine-version.c $(LIBS) -o $@
+	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -std=c99 limine-version.c $(LIBS) -o $@
 
 limine-enroll-config: limine-enroll-config.c
-	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -std=c99 -D__USE_MINGW_ANSI_STDIO limine-enroll-config.c $(LIBS) -o $@
+	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -std=c99 limine-enroll-config.c $(LIBS) -o $@