From 09e1393453df85d4ee67674f52fd3521ca6c78b3 Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Mon, 6 Feb 2023 15:23:54 +0100 Subject: [PATCH] build: don't record DESTDIR in config.DefaultPath --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 2861e16..f85d1f4 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ SYSCONFDIR ?= /etc RUNDIR ?= /run sharedstatedir := /var/lib -config_path := $(DESTDIR)$(SYSCONFDIR)/soju/config +config_path := $(SYSCONFDIR)/soju/config admin_socket_path := $(RUNDIR)/soju/admin goflags := $(GOFLAGS) -ldflags=" \ -X 'git.sr.ht/~emersion/soju/config.DefaultPath=$(config_path)' \ @@ -35,6 +35,6 @@ install: mkdir -p $(DESTDIR)$(sharedstatedir)/soju cp -f soju sojudb sojuctl $(DESTDIR)$(PREFIX)/$(BINDIR) cp -f doc/soju.1 $(DESTDIR)$(PREFIX)/$(MANDIR)/man1 - [ -f $(config_path) ] || cp -f config.in $(config_path) + [ -f $(DESTDIR)$(config_path) ] || cp -f config.in $(DESTDIR)$(config_path) .PHONY: soju sojudb sojuctl clean install