From 01e90ec4d842dfed711ce6301fe4f80e946d1f10 Mon Sep 17 00:00:00 2001 From: Jeremy Baxter Date: Fri, 22 Dec 2023 16:20:21 +1300 Subject: [PATCH] Fix build on BSD Removed the line `SHELL:=/usr/bin/env bash'. Most BSDs don't ship bash in the base system by default and the build doesn't need it anyway. Also added some more version statements to define useXDG for the other BSDs. --- makefile | 2 -- src/dscanner/main.d | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/makefile b/makefile index 243c4506..4d6dcedd 100644 --- a/makefile +++ b/makefile @@ -86,8 +86,6 @@ else ifneq (,$(findstring gdc, $(DC))) WRITE_TO_TARGET_NAME = -o $@ endif -SHELL:=/usr/bin/env bash - GITHASH = bin/githash.txt diff --git a/src/dscanner/main.d b/src/dscanner/main.d index 35f1fae2..dbf1b4bb 100644 --- a/src/dscanner/main.d +++ b/src/dscanner/main.d @@ -574,6 +574,9 @@ private enum CONFIG_FILE_NAME = "dscanner.ini"; version (linux) version = useXDG; version (BSD) version = useXDG; version (FreeBSD) version = useXDG; +version (OpenBSD) version = useXDG; +version (NetBSD) version = useXDG; +version (DragonflyBSD) version = useXDG; version (OSX) version = useXDG; /**