diff options
| -rw-r--r-- | Makefile | 47 | ||||
| -rw-r--r-- | catsit-timer.1 | 2 | ||||
| -rw-r--r-- | catsit-timer.c | 2 | ||||
| -rw-r--r-- | catsit-watch.1 | 2 | ||||
| -rw-r--r-- | catsit-watch.c | 2 | ||||
| -rw-r--r-- | catsit.8 | 2 | ||||
| -rw-r--r-- | catsit.conf.5 | 2 | ||||
| -rw-r--r-- | catsitd.8 | 2 | ||||
| -rw-r--r-- | daemon.c | 2 | ||||
| -rw-r--r-- | daemon.h | 2 | ||||
| -rw-r--r-- | service.c | 2 |
11 files changed, 29 insertions, 38 deletions
diff --git a/Makefile b/Makefile index 2f52b2f..a3b40b7 100644 --- a/Makefile +++ b/Makefile @@ -3,10 +3,10 @@ UNAME != uname PREFIX ?= /usr/local MANDIR ?= ${PREFIX}/man RUNDIR ?= /var/run -.if ${UNAME} == OpenBSD -ETCDIR ?= /etc -.else +.if ${UNAME} == FreeBSD ETCDIR ?= ${PREFIX}/etc +.else +ETCDIR ?= /etc .endif CFLAGS += -std=c99 -Wall -Wextra -Wpedantic @@ -18,12 +18,9 @@ RC_SCRIPT = ${UNAME}/catsitd BINS = catsit-timer catsit-watch SBINS = catsit catsitd -MAN1 = ${BINS:=.1} -MAN5 = catsit.conf.5 -MAN8 = ${SBINS:=.8} +MANS = ${BINS:=.1} catsit.conf.5 ${SBINS:=.8} -OBJS += daemon.o -OBJS += service.o +OBJS = daemon.o service.o dev: tags all @@ -46,34 +43,28 @@ tags: *.[ch] clean: rm -f ${BINS} ${SBINS} ${OBJS} ${RC_SCRIPT} tags -install: ${BINS} ${SBINS} ${RC_SCRIPT} ${MAN1} ${MAN5} ${MAN8} +install: ${BINS} ${SBINS} ${MANS} ${RC_SCRIPT} install -d ${DESTDIR}${PREFIX}/bin install -d ${DESTDIR}${PREFIX}/sbin - install -d ${DESTDIR}${MANDIR}/man1 - install -d ${DESTDIR}${MANDIR}/man5 - install -d ${DESTDIR}${MANDIR}/man8 +.for sect in 1 5 8 + install -d ${DESTDIR}${MANDIR}/man${sect} +.endfor install -d ${DESTDIR}${ETCDIR}/rc.d install ${BINS} ${DESTDIR}${PREFIX}/bin install ${SBINS} ${DESTDIR}${PREFIX}/sbin +.for man in ${MANS} + install -m 444 ${man} ${DESTDIR}${MANDIR}/man${man:E} +.endfor install ${RC_SCRIPT} ${DESTDIR}${ETCDIR}/rc.d - install -m 644 ${MAN1} ${DESTDIR}${MANDIR}/man1 - install -m 644 ${MAN5} ${DESTDIR}${MANDIR}/man5 - install -m 644 ${MAN8} ${DESTDIR}${MANDIR}/man8 uninstall: -.for BIN in ${BINS} - rm -f ${DESTDIR}${PREFIX}/bin/${BIN} -.endfor -.for SBIN in ${SBINS} - rm -f ${DESTDIR}${PREFIX}/sbin/${SBIN} +.for bin in ${BINS} + rm -f ${DESTDIR}${PREFIX}/bin/${bin} .endfor - rm -f ${DESTDIR}${ETCDIR}/rc.d/${RC_SCRIPT:T} -.for MAN in ${MAN1} - rm -f ${DESTDIR}${MANDIR}/man1/${MAN} +.for sbin in ${SBINS} + rm -f ${DESTDIR}${PREFIX}/sbin/${sbin} .endfor -.for MAN in ${MAN5} - rm -f ${DESTDIR}${MANDIR}/man5/${MAN} -.endfor -.for MAN in ${MAN8} - rm -f ${DESTDIR}${MANDIR}/man8/${MAN} +.for man in ${MANS} + rm -f ${DESTDIR}${MANDIR}/man${man:E}/${man} .endfor + rm -f ${DESTDIR}${ETCDIR}/rc.d/${RC_SCRIPT:T} diff --git a/catsit-timer.1 b/catsit-timer.1 index 9ad8956..53f6024 100644 --- a/catsit-timer.1 +++ b/catsit-timer.1 @@ -59,4 +59,4 @@ exits with the same status. .Xr catsitd 8 . .Sh AUTHORS -.An June Bug Aq Mt june@causal.agency +.An June McEnroe Aq Mt june@causal.agency diff --git a/catsit-timer.c b/catsit-timer.c index 2869311..1f754c3 100644 --- a/catsit-timer.c +++ b/catsit-timer.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2021 C. McEnroe <june@causal.agency> +/* Copyright (C) 2021 June McEnroe <june@causal.agency> * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by diff --git a/catsit-watch.1 b/catsit-watch.1 index 5e97bdd..b5ccccd 100644 --- a/catsit-watch.1 +++ b/catsit-watch.1 @@ -61,4 +61,4 @@ exits with the same status. .Xr catsitd 8 . .Sh AUTHORS -.An June Bug Aq Mt june@causal.agency +.An June McEnroe Aq Mt june@causal.agency diff --git a/catsit-watch.c b/catsit-watch.c index 096449b..1bee8cf 100644 --- a/catsit-watch.c +++ b/catsit-watch.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2021 C. McEnroe <june@causal.agency> +/* Copyright (C) 2021 June McEnroe <june@causal.agency> * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by diff --git a/catsit.8 b/catsit.8 index 10cfbc7..e52b188 100644 --- a/catsit.8 +++ b/catsit.8 @@ -124,4 +124,4 @@ catsit INFO 'pounce/*' .Xr catsitd 8 . .Sh AUTHORS -.An June Bug Aq Mt june@causal.agency +.An June McEnroe Aq Mt june@causal.agency diff --git a/catsit.conf.5 b/catsit.conf.5 index 77b4235..e9de2ce 100644 --- a/catsit.conf.5 +++ b/catsit.conf.5 @@ -96,4 +96,4 @@ pounce/libera pounce ${0#*/}.conf .Xr catsitd 8 . .Sh AUTHORS -.An June Bug Aq Mt june@causal.agency +.An June McEnroe Aq Mt june@causal.agency diff --git a/catsitd.8 b/catsitd.8 index fa1e67a..aaedbf0 100644 --- a/catsitd.8 +++ b/catsitd.8 @@ -223,4 +223,4 @@ used for service control. .Xr catsit 8 . .Sh AUTHORS -.An June Bug Aq Mt june@causal.agency +.An June McEnroe Aq Mt june@causal.agency diff --git a/daemon.c b/daemon.c index 0086a3d..736fd08 100644 --- a/daemon.c +++ b/daemon.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2020 C. McEnroe <june@causal.agency> +/* Copyright (C) 2020 June McEnroe <june@causal.agency> * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by diff --git a/daemon.h b/daemon.h index fb58088..b68c51c 100644 --- a/daemon.h +++ b/daemon.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2020 C. McEnroe <june@causal.agency> +/* Copyright (C) 2020 June McEnroe <june@causal.agency> * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by diff --git a/service.c b/service.c index 5b1d620..2406175 100644 --- a/service.c +++ b/service.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2020 C. McEnroe <june@causal.agency> +/* Copyright (C) 2020 June McEnroe <june@causal.agency> * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by |