4c0d37
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
4c0d37
From: Peter Jones <pjones@redhat.com>
4c0d37
Date: Fri, 25 Oct 2019 15:42:10 -0400
4c0d37
Subject: [PATCH] Install all headers for all arches.
4c0d37
4c0d37
This further enables cross-builds by installing all the arches headers.
4c0d37
4c0d37
Signed-off-by: Peter Jones <pjones@redhat.com>
4c0d37
---
4c0d37
 inc/Makefile | 17 ++++++++++-------
4c0d37
 1 file changed, 10 insertions(+), 7 deletions(-)
4c0d37
4c0d37
diff --git a/inc/Makefile b/inc/Makefile
4c0d37
index 445d340f0fa..e8123fd3115 100644
4c0d37
--- a/inc/Makefile
4c0d37
+++ b/inc/Makefile
4c0d37
@@ -9,15 +9,18 @@ all:
4c0d37
 
4c0d37
 clean:
4c0d37
 
4c0d37
+SOURCE=$(realpath $(SRCDIR))
4c0d37
+DEST=$(INSTALLROOT)$(PREFIX)/include/efi
4c0d37
+INCLUDEDIRS=$(sort $(shell find $(SOURCE) -type d))
4c0d37
+
4c0d37
 install:
4c0d37
-	mkdir -p $(INSTALLROOT)$(PREFIX)/include/efi
4c0d37
-	mkdir -p $(INSTALLROOT)$(PREFIX)/include/efi/protocol
4c0d37
-	mkdir -p $(INSTALLROOT)$(PREFIX)/include/efi/$(ARCH)
4c0d37
-	$(INSTALL) -m 644 $(SRCDIR)/*.h $(INSTALLROOT)$(PREFIX)/include/efi
4c0d37
-	$(INSTALL) -m 644 $(SRCDIR)/protocol/*.h $(INSTALLROOT)$(PREFIX)/include/efi/protocol
4c0d37
-	$(INSTALL) -m 644 $(SRCDIR)/$(ARCH)/*.h $(INSTALLROOT)$(PREFIX)/include/efi/$(ARCH)
4c0d37
+	@$(foreach d,$(INCLUDEDIRS), \
4c0d37
+		$(INSTALL) -v -m 755 -d $(subst $(SOURCE),$(DEST),$(d)); \
4c0d37
+		$(INSTALL) -v -m 644 -t $(subst $(SOURCE),$(DEST),$(d)) $(wildcard $(d)/*.h); \
4c0d37
+	)
4c0d37
 
4c0d37
 install_compat: install
4c0d37
-	@if [ ! -h $(DEST)/$(BFD_ARCH) ]; then $(SYMLINK) $(ARCH) $(INSTALLROOT)$(PREFIX)/include/efi/$(BFD_ARCH) ; fi
4c0d37
+	@if [ ! -h $(DEST)/x86_64 ]; then $(SYMLINK) x64/ $(DEST)/x86_64 ; fi
4c0d37
+	@if [ ! -h $(DEST)/aarch64 ]; then $(SYMLINK) aa64/ $(DEST)/aarch64 ; fi
4c0d37
 
4c0d37
 include $(SRCDIR)/../Make.rules