From 43c147c6cfd0bb118c416b67812f8d9a6678ecb3 Mon Sep 17 00:00:00 2001
From: Ariadne Conill <ariadne@dereferenced.org>
Date: Sun, 26 Jul 2020 03:16:52 -0600
Subject: [PATCH] build: allow for non-linux executors

---
 Makefile                             | 6 ++++--
 executor-scripts/{ => linux}/dhcp    | 0
 executor-scripts/{ => linux}/ipv6-ra | 0
 executor-scripts/{ => linux}/static  | 0
 4 files changed, 4 insertions(+), 2 deletions(-)
 rename executor-scripts/{ => linux}/dhcp (100%)
 rename executor-scripts/{ => linux}/ipv6-ra (100%)
 rename executor-scripts/{ => linux}/static (100%)

diff --git a/Makefile b/Makefile
index dfdf508..fd8a33c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,4 @@
+LAYOUT ?= linux
 SCDOC := scdoc
 LIBBSD_CFLAGS =
 LIBBSD_LIBS =
@@ -50,7 +51,8 @@ IFUPDOWN_OBJ = ${IFUPDOWN_SRC:.c=.o}
 
 EXECUTOR_SCRIPTS = \
 	dhcp \
-	ipv6-ra
+	ipv6-ra \
+	static
 
 CMD_OBJ = ${MULTICALL_OBJ} ${IFQUERY_OBJ} ${IFUPDOWN_OBJ}
 
@@ -84,7 +86,7 @@ install: all
 		ln -s /sbin/${MULTICALL} ${DESTDIR}/sbin/$$i; \
 	done
 	for i in ${EXECUTOR_SCRIPTS}; do \
-		install -D -m755 executor-scripts/$$i ${DESTDIR}${EXECUTOR_PATH}/$$i; \
+		install -D -m755 executor-scripts/${LAYOUT}/$$i ${DESTDIR}${EXECUTOR_PATH}/$$i; \
 	done
 
 .scd.1 .scd.2 .scd.3 .scd.4 .scd.5 .scd.6 .scd.7 .scd.8:
diff --git a/executor-scripts/dhcp b/executor-scripts/linux/dhcp
similarity index 100%
rename from executor-scripts/dhcp
rename to executor-scripts/linux/dhcp
diff --git a/executor-scripts/ipv6-ra b/executor-scripts/linux/ipv6-ra
similarity index 100%
rename from executor-scripts/ipv6-ra
rename to executor-scripts/linux/ipv6-ra
diff --git a/executor-scripts/static b/executor-scripts/linux/static
similarity index 100%
rename from executor-scripts/static
rename to executor-scripts/linux/static