Compare commits

3 Commits

Author SHA1 Message Date
41afd81c9b Add missing directory on install 2025-12-31 16:47:49 +01:00
51d17d5f25 Fix typo 2025-12-31 16:45:30 +01:00
8c6f87c3b8 Fix Makefile typo 2025-12-31 16:42:54 +01:00

View File

@@ -2,11 +2,10 @@ NAME = $(shell basename $(PWD))
VERSION = $(shell git describe | sed 's/-/./g') VERSION = $(shell git describe | sed 's/-/./g')
BRANCH = $(shell git branch --show-current) BRANCH = $(shell git branch --show-current)
define rpm_eval RPM_SOURCEDIR = $(shell rpm --eval '%{_sourcedir}')
rpm --eval '%{$(1)}' RPM_SYSCONFDIR = $(shell rpm --eval '%{_sysconfdir}')
endef RPM_UNITDIR = $(shell rpm --eval '%{_unitdir}')
RPM_TARBALL_PATH = $(RPM_SOURCEDIR)/$(NAME)-$(VERSION).tar.gz
TARBALL_PATH = $(call rpm_eval,_sourcedir)/$(NAME)-$(VERSION).tar.gz
.PHONY: name .PHONY: name
name: name:
@@ -16,7 +15,7 @@ name:
version: version:
@echo "$(VERSION)" @echo "$(VERSION)"
$(TARBALL_PATH): * $(RPM_TARBALL_PATH): *
git archive --format=tar.gz \ git archive --format=tar.gz \
--output="$@" \ --output="$@" \
--prefix="$(NAME)-$(VERSION)/" \ --prefix="$(NAME)-$(VERSION)/" \
@@ -24,11 +23,12 @@ $(TARBALL_PATH): *
"$(BRANCH)" "$(BRANCH)"
.PHONY: tarball .PHONY: tarball
tarball: $(TARBALL_PATH) tarball: $(RPM_TARBALL_PATH)
.PHONY: install .PHONY: install
install: install:
install --directory $(DESTDIR)$(call rpm_eval,_sysconfdir)/netoik-rp install --directory $(DESTDIR)$(RPM_SYSCONFDIR)/netoik-rp
install --target-directory=$(DESTDIR)$(call rpm_eval,_sysconfdir)/netoik-rp/ conf/neotik-rp.conf install --target-directory=$(DESTDIR)$(RPM_SYSCONFDIR)/netoik-rp/ conf/netoik-rp.conf
install --target-directory=$(DESTDIR)$(call rpm_eval,_sysconfdir)/netoik-rp/ conf/ovh.ini install --target-directory=$(DESTDIR)$(RPM_SYSCONFDIR)/netoik-rp/ conf/ovh.ini
install --target-directory=$(DESTDIR)$(call rpm_eval,_unitdir)/ services/netoik-rp.service install --directory=$(DESTDIR)$(RPM_UNITDIR)
install --target-directory=$(DESTDIR)$(RPM_UNITDIR)/ services/netoik-rp.service