summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorGravatar Christian Hesse <mail@eworm.de>2017-05-13 12:30:08 +0200
committerGravatar Christian Hesse <mail@eworm.de>2017-05-13 12:30:08 +0200
commitcdbb05bf6a2864077f905cb96353e83f5b2b9ea8 (patch)
tree101768ce520c1c44f69e956f31b255d38f89cd5a /Makefile
parent8667fb8d747569f83c48bb14f3410af652cd7b15 (diff)
downloadpacredir-cdbb05bf6a2864077f905cb96353e83f5b2b9ea8.tar.gz
pacredir-cdbb05bf6a2864077f905cb96353e83f5b2b9ea8.tar.zst
add distribution ID to avahi service names
Now that we have pacredir in official repositories... ArchLinux ARM will have the package as well, having package names (at least for 'any') clash. So add distribution ID to avahi service names. This is incompatible with pacredir < 0.2.3, so make sure to update all your installations.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile18
1 files changed, 12 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index b0f5870..800d0b8 100644
--- a/Makefile
+++ b/Makefile
@@ -21,17 +21,20 @@ CFLAGS_EXTRA += $(shell pkg-config --libs --cflags libmicrohttpd)
CFLAGS_EXTRA += -liniparser
LDFLAGS += -Wl,-z,now -Wl,-z,relro -pie
+# the distribution ID
+ID := $(shell grep 'ID=' < /etc/os-release | cut -d= -f2)
+
# this is just a fallback in case you do not use git but downloaded
# a release tarball...
VERSION := 0.2.2
-all: pacredir avahi/pacdbserve.service README.html
+all: pacredir avahi/pacdbserve.service avahi/pacserve.service README.html
arch: arch.c arch.h
$(CC) $(CFLAGS) $(LDFLAGS) -o arch arch.c
pacredir: pacredir.c arch.h pacredir.h config.h version.h
- $(CC) $(CFLAGS) $(CFLAGS_EXTRA) $(LDFLAGS) -o pacredir pacredir.c
+ $(CC) $(CFLAGS) $(CFLAGS_EXTRA) $(LDFLAGS) -DID=\"$(ID)\" -o pacredir pacredir.c
config.h:
$(CP) config.def.h config.h
@@ -42,14 +45,17 @@ version.h: $(wildcard .git/HEAD .git/index .git/refs/tags/*) Makefile
echo "#endif" >> $@
avahi/pacdbserve.service: arch avahi/pacdbserve.service.in
- $(SED) 's/%ARCH%/$(shell ./arch)/' avahi/pacdbserve.service.in > avahi/pacdbserve.service
+ $(SED) 's/%ARCH%/$(shell ./arch)/;s/%ID%/$(ID)/' avahi/pacdbserve.service.in > avahi/pacdbserve.service
+
+avahi/pacserve.service: avahi/pacserve.service.in
+ $(SED) 's/%ID%/$(ID)/' avahi/pacserve.service.in > avahi/pacserve.service
README.html: README.md
$(MD) README.md > README.html
install: install-bin install-doc
-install-bin: pacredir
+install-bin: pacredir avahi/pacdbserve.service avahi/pacserve.service
$(INSTALL) -D -m0755 pacredir $(DESTDIR)$(PREFIX)/bin/pacredir
$(LN) -s darkhttpd $(DESTDIR)$(PREFIX)/bin/pacserve
$(LN) -s darkhttpd $(DESTDIR)$(PREFIX)/bin/pacdbserve
@@ -70,10 +76,10 @@ install-doc: README.html
$(INSTALL) -D -m0644 README.html $(DESTDIR)$(PREFIX)/share/doc/pacredir/README.html
clean:
- $(RM) -f *.o *~ arch pacredir avahi/pacdbserve.service README.html version.h
+ $(RM) -f *.o *~ arch pacredir avahi/pacdbserve.service avahi/pacserve.service README.html version.h
distclean:
- $(RM) -f *.o *~ arch pacredir avahi/pacdbserve.service README.html version.h config.h
+ $(RM) -f *.o *~ arch pacredir avahi/pacdbserve.service avahi/pacserve.service README.html version.h config.h
release:
git archive --format=tar.xz --prefix=pacredir-$(VERSION)/ $(VERSION) > pacredir-$(VERSION).tar.xz