From 00ea1a5bfda8aeba7e187cceb1a711c67c92dd8f Mon Sep 17 00:00:00 2001 From: Henrik Hautakoski Date: Sun, 14 May 2023 17:56:21 +0200 Subject: [PATCH] Makefile: move "thalos" subdirectory into CFGDIR instead of hardcoded after CFGDIR --- Makefile | 4 ++-- debian/rules | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 09072f5..55d190b 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ PROGRAM=thalos-server PROGRAM_VERSION=0.1.0 PREFIX=/usr/local BINDIR=$(PREFIX)/bin -CFGDIR=$(PREFIX)/etc +CFGDIR=$(PREFIX)/etc/thalos .PHONY: build build/$(PROGRAM) test @@ -16,7 +16,7 @@ build/$(PROGRAM) : install: build install -D build/$(PROGRAM) $(DESTDIR)$(BINDIR)/$(PROGRAM) - install -m 644 -D config.example.yml $(DESTDIR)$(CFGDIR)/thalos/config.yml + install -m 644 -D config.example.yml $(DESTDIR)$(CFGDIR)/config.yml test: $(GO) test -v ./... diff --git a/debian/rules b/debian/rules index 9a857d0..c4f8ad4 100755 --- a/debian/rules +++ b/debian/rules @@ -9,4 +9,4 @@ override_dh_auto_build: dh_auto_build -- GOOS=linux override_dh_auto_install: - dh_auto_install -- PREFIX=/usr CFGDIR=/etc + dh_auto_install -- PREFIX=/usr CFGDIR=/etc/thalos