From 2587acda28156f50149a15cad67d0c0bc1eb0bb4 Mon Sep 17 00:00:00 2001 From: Jouke Witteveen Date: Sun, 5 May 2013 23:07:06 +0200 Subject: Use pkg-config to obtain the systemd system unit directory This ensures the units are installed correctly if systemd is installed in an alternate location like /lib/systemd. Idem for the location of profile-based units. Based on a proposal by: Mike Gilbert --- Makefile | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index bf48aa5..2fcf62b 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,11 @@ export VERSION = 1.0 +PKG_CONFIG ?= pkg-config + +sd_var = $(shell $(PKG_CONFIG) --variable=systemd$(1) systemd) +systemdsystemconfdir = $(call sd_var,systemconfdir) +systemdsystemunitdir = $(call sd_var,systemunitdir) + .PHONY: install tarball pkgbuild clean install: @@ -15,35 +21,38 @@ install: install -m755 src/lib/{auto.action,network} $(DESTDIR)/usr/lib/network/ # Scripts install -d $(DESTDIR)/usr/bin + sed -e "s|@systemdsystemconfdir@|$(systemdsystemconfdir)|g" \ + -e "s|@systemdsystemunitdir@|$(systemdsystemunitdir)|g" \ + src/netctl.in > $(DESTDIR)/usr/bin/netctl + chmod 755 $(DESTDIR)/usr/bin/netctl install -m755 \ - src/netctl \ src/netctl-auto \ src/wifi-menu \ $(DESTDIR)/usr/bin/ install -Dm755 src/ifplugd.action $(DESTDIR)/etc/ifplugd/netctl.action # Services - install -d $(DESTDIR)/usr/lib/systemd/system - install -m644 services/*.service $(DESTDIR)/usr/lib/systemd/system/ + install -d $(DESTDIR)$(systemdsystemunitdir) + install -m644 services/*.service $(DESTDIR)$(systemdsystemunitdir)/ tarball: netctl-$(VERSION).tar.xz netctl-$(VERSION).tar.xz: $(MAKE) -B -C docs - cp src/netctl{,.orig} - sed -i "s/NETCTL_VERSION=.*/NETCTL_VERSION=$(VERSION)/" src/netctl + cp src/netctl.in{,.orig} + sed -i "s|NETCTL_VERSION=.*|NETCTL_VERSION=$(VERSION)|" src/netctl.in git stash save -q git archive -o netctl-$(VERSION).tar --prefix=netctl-$(VERSION)/ stash git stash pop -q - mv src/netctl{.orig,} - tar --exclude-vcs --transform "s%^%netctl-$(VERSION)/%" --owner=root --group=root --mtime=./netctl-$(VERSION).tar -rf netctl-$(VERSION).tar docs/*.[1-8] + mv src/netctl.in{.orig,} + tar --exclude-vcs --transform "s|^|netctl-$(VERSION)/|" --owner=root --group=root --mtime=./netctl-$(VERSION).tar -rf netctl-$(VERSION).tar docs/*.[1-8] xz netctl-$(VERSION).tar gpg --detach-sign $@ pkgbuild: PKGBUILD -PKGBUILD: netctl-$(VERSION).tar.xz - sed -e "s/%pkgver%/$(VERSION)/g" \ - -e "s/%md5sum%/$(shell md5sum $< | cut -d ' ' -f 1)/" \ - -e "s/%md5sum.sig%/$(shell md5sum $<.sig | cut -d ' ' -f 1)/" \ - contrib/PKGBUILD > $@ +PKGBUILD: netctl-$(VERSION).tar.xz contrib/PKGBUILD.in + sed -e "s|@pkgver@|$(VERSION)|g" \ + -e "s|@md5sum@|$(shell md5sum $< | cut -d ' ' -f 1)|" \ + -e "s|@md5sum.sig@|$(shell md5sum $<.sig | cut -d ' ' -f 1)|" \ + $(lastword $^) > $@ upload: netctl-$(VERSION).tar.xz scp $< $<.sig nymeria.archlinux.org:/srv/ftp/other/packages/netctl -- cgit v1.2.3-24-g4f1b