From e2fd7649caff9740663faca9380f426828fa5ce7 Mon Sep 17 00:00:00 2001 From: Callum Farmer Date: Sat, 6 Dec 2025 11:55:03 +0000 Subject: [PATCH] Fix gnu-efi.pc target definition Split libraries to separate Makefile definition Avoids installing duplicate pkgconfig to libdir --- gnuefi/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnuefi/Makefile b/gnuefi/Makefile index f74afbb7..5972a31f 100644 --- a/gnuefi/Makefile +++ b/gnuefi/Makefile @@ -79,7 +79,8 @@ ifneq (,$(filter $(ARCH),aarch64 riscv64 ia32)) CRT0_LOCAL_TARGET = crt0-efi-$(ARCH)-local.o endif -TARGETS = crt0-efi-$(ARCH).o libgnuefi.a $(CRT0_LOCAL_TARGET) gnu-efi.pc +LIBS = crt0-efi-$(ARCH).o libgnuefi.a $(CRT0_LOCAL_TARGET) +TARGETS = $(LIBS) gnu-efi.pc all: $(TARGETS) @@ -109,7 +110,7 @@ clean: install: mkdir -p $(INSTALLROOT)$(LIBDIR) - $(INSTALL) -m 644 $(TARGETS) $(INSTALLROOT)$(LIBDIR) + $(INSTALL) -m 644 $(LIBS) $(INSTALLROOT)$(LIBDIR) ifneq (,$(filter $(ARCH),x86_64 ia32)) $(INSTALL) -m 644 $(SRCDIR)/elf_$(ARCH)_fbsd_efi.lds $(INSTALLROOT)$(LIBDIR) endif