From 3f9a6569293a1b388e7f3cbcf09fb80bc29dae91 Mon Sep 17 00:00:00 2001
From: Callum Farmer <gmbr3@opensuse.org>
Date: Sun, 5 Mar 2023 13:20:45 +0000
Subject: [PATCH] apps: Fix Makefile install and ordering

Create a new directory called $APPSDIR
which is the default install location of
these examples. apps must be ordered after
gnuefi target.

Signed-off-by: Callum Farmer <gmbr3@opensuse.org>
---
 Makefile      | 1 +
 apps/Makefile | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/Makefile b/Makefile
index 270a203..b8a6578 100644
--- a/Makefile
+++ b/Makefile
@@ -48,6 +48,7 @@ SUBDIRS = lib gnuefi inc apps
 all:	check_gcc $(SUBDIRS)
 
 gnuefi: lib
+apps:	gnuefi
 
 mkvars:
 	@echo AR=$(AR)
diff --git a/apps/Makefile b/apps/Makefile
index 4e1b69a..cdfb257 100644
--- a/apps/Makefile
+++ b/apps/Makefile
@@ -44,6 +44,7 @@ TOPDIR = $(SRCDIR)/..
 
 CDIR=$(TOPDIR)/..
 LINUX_HEADERS	= /usr/src/sys/build
+APPSDIR		= $(LIBDIR)/gnuefi/apps
 CPPFLAGS	+= -D__KERNEL__ -I$(LINUX_HEADERS)/include
 CRTOBJS		= ../gnuefi/crt0-efi-$(ARCH).o
 
@@ -90,6 +91,10 @@ all:	$(TARGETS)
 clean:
 	rm -f $(TARGETS) *~ *.o *.so
 
+install:
+	mkdir -p $(INSTALLROOT)$(APPSDIR)
+	$(INSTALL) -m 644 $(TARGETS) $(INSTALLROOT)$(APPSDIR)
+
 .PHONY: install
 
 include $(SRCDIR)/../Make.rules