From 8c6f87c3b852fb203512ba4f8c7130a6c6eacf1b Mon Sep 17 00:00:00 2001 From: samuel Date: Wed, 31 Dec 2025 16:42:54 +0100 Subject: [PATCH] Fix Makefile typo --- Makefile | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index b6efd0c..a7f1e84 100644 --- a/Makefile +++ b/Makefile @@ -2,11 +2,10 @@ NAME = $(shell basename $(PWD)) VERSION = $(shell git describe | sed 's/-/./g') BRANCH = $(shell git branch --show-current) -define rpm_eval - rpm --eval '%{$(1)}' -endef - -TARBALL_PATH = $(call rpm_eval,_sourcedir)/$(NAME)-$(VERSION).tar.gz +RPM_SOURCEDIR = $(shell rpm --eval '%{_sourcedir}') +RPM_SYSCONFDIR = $(shell rpm --eval '%{_sysconfdir}') +RPM_UNITDIR = $(shell rpm --eval '%{_unitdir}') +RPM_TARBALL_PATH = $(RPM_SOURCEDIR)/$(NAME)-$(VERSION).tar.gz .PHONY: name name: @@ -16,7 +15,7 @@ name: version: @echo "$(VERSION)" -$(TARBALL_PATH): * +$(RPM_TARBALL_PATH): * git archive --format=tar.gz \ --output="$@" \ --prefix="$(NAME)-$(VERSION)/" \ @@ -24,11 +23,11 @@ $(TARBALL_PATH): * "$(BRANCH)" .PHONY: tarball -tarball: $(TARBALL_PATH) +tarball: $(RPM_TARBALL_PATH) .PHONY: install install: - install --directory $(DESTDIR)$(call rpm_eval,_sysconfdir)/netoik-rp - install --target-directory=$(DESTDIR)$(call rpm_eval,_sysconfdir)/netoik-rp/ conf/neotik-rp.conf - install --target-directory=$(DESTDIR)$(call rpm_eval,_sysconfdir)/netoik-rp/ conf/ovh.ini - install --target-directory=$(DESTDIR)$(call rpm_eval,_unitdir)/ services/netoik-rp.service + install --directory $(DESTDIR)$(RPM_SYSCONFDIR)/netoik-rp + install --target-directory=$(DESTDIR)$(RPM_SYSCONFDIR)/netoik-rp/ conf/neotik-rp.conf + install --target-directory=$(DESTDIR)$(RPM_SYSCONFDIR)/netoik-rp/ conf/ovh.ini + install --target-directory=$(DESTDIR)$(RPM_UNITDIR)/ services/netoik-rp.service