| @@ -1,33 +1,33 @@ | | | @@ -1,33 +1,33 @@ |
1 | $NetBSD: patch-Makefile,v 1.4 2020/07/29 12:27:13 wiz Exp $ | | 1 | $NetBSD: patch-Makefile,v 1.5 2020/08/11 18:40:45 joerg Exp $ |
2 | | | 2 | |
3 | Use BSD_INSTALL. | | 3 | Use BSD_INSTALL. |
4 | | | 4 | |
5 | --- Makefile.orig 2020-07-23 10:27:50.000000000 +0000 | | 5 | --- Makefile.orig 2020-07-23 10:27:50.000000000 +0000 |
6 | +++ Makefile | | 6 | +++ Makefile |
7 | @@ -165,19 +165,19 @@ clean-coverage-run: | | 7 | @@ -165,19 +165,19 @@ clean-coverage-run: |
8 | install: install-dunst install-dunstctl install-doc install-service install-dunstify | | 8 | install: install-dunst install-dunstctl install-doc install-service install-dunstify |
9 | | | 9 | |
10 | install-dunst: dunst doc | | 10 | install-dunst: dunst doc |
11 | - install -Dm755 dunst ${DESTDIR}${BINDIR}/dunst | | 11 | - install -Dm755 dunst ${DESTDIR}${BINDIR}/dunst |
12 | - install -Dm644 docs/dunst.1 ${DESTDIR}${MANPREFIX}/man1/dunst.1 | | 12 | - install -Dm644 docs/dunst.1 ${DESTDIR}${MANPREFIX}/man1/dunst.1 |
13 | - install -Dm644 docs/dunstctl.1 ${DESTDIR}${MANPREFIX}/man1/dunstctl.1 | | 13 | - install -Dm644 docs/dunstctl.1 ${DESTDIR}${MANPREFIX}/man1/dunstctl.1 |
14 | + ${BSD_INSTALL_PROGRAM} dunst ${DESTDIR}${BINDIR}/dunst | | 14 | + ${BSD_INSTALL_PROGRAM} dunst ${DESTDIR}${BINDIR}/dunst |
15 | + ${BSD_INSTALL_DATA} docs/dunst.1 ${DESTDIR}${MANPREFIX}/man1/dunst.1 | | 15 | + ${BSD_INSTALL_DATA} docs/dunst.1 ${DESTDIR}${MANPREFIX}/man1/dunst.1 |
16 | + ${BSD_INSTALL_DATA} docs/dunstctl.1 ${DESTDIR}${MANPREFIX}/man1/dunstctl.1 | | 16 | + ${BSD_INSTALL_DATA} docs/dunstctl.1 ${DESTDIR}${MANPREFIX}/man1/dunstctl.1 |
17 | | | 17 | |
18 | install-dunstctl: dunstctl | | 18 | install-dunstctl: dunstctl |
19 | - install -Dm755 dunstctl ${DESTDIR}${BINDIR}/dunstctl | | 19 | - install -Dm755 dunstctl ${DESTDIR}${BINDIR}/dunstctl |
20 | + ${BSD_INSTALL_PROGRAM} dunstctl ${DESTDIR}${BINDIR}/dunstctl | | 20 | + ${BSD_INSTALL_SCRIPT} dunstctl ${DESTDIR}${BINDIR}/dunstctl |
21 | | | 21 | |
22 | install-doc: | | 22 | install-doc: |
23 | - install -Dm644 dunstrc ${DESTDIR}${DATADIR}/dunst/dunstrc | | 23 | - install -Dm644 dunstrc ${DESTDIR}${DATADIR}/dunst/dunstrc |
24 | + ${BSD_INSTALL_DATA} dunstrc ${DESTDIR}${DATADIR}/dunst/dunstrc | | 24 | + ${BSD_INSTALL_DATA} dunstrc ${DESTDIR}${DATADIR}/dunst/dunstrc |
25 | | | 25 | |
26 | install-service: install-service-dbus | | 26 | install-service: install-service-dbus |
27 | install-service-dbus: service-dbus | | 27 | install-service-dbus: service-dbus |
28 | - install -Dm644 org.knopwob.dunst.service ${DESTDIR}${SERVICEDIR_DBUS}/org.knopwob.dunst.service | | 28 | - install -Dm644 org.knopwob.dunst.service ${DESTDIR}${SERVICEDIR_DBUS}/org.knopwob.dunst.service |
29 | + ${BSD_INSTALL_DATA} org.knopwob.dunst.service ${DESTDIR}${SERVICEDIR_DBUS}/org.knopwob.dunst.service | | 29 | + ${BSD_INSTALL_DATA} org.knopwob.dunst.service ${DESTDIR}${SERVICEDIR_DBUS}/org.knopwob.dunst.service |
30 | ifneq (0,${SYSTEMD}) | | 30 | ifneq (0,${SYSTEMD}) |
31 | install-service: install-service-systemd | | 31 | install-service: install-service-systemd |
32 | install-service-systemd: service-systemd | | 32 | install-service-systemd: service-systemd |
33 | @@ -185,7 +185,7 @@ install-service-systemd: service-systemd | | 33 | @@ -185,7 +185,7 @@ install-service-systemd: service-systemd |