Patrick Williams | 5877637 | 2022-04-13 09:07:35 -0500 | [diff] [blame^] | 1 | From 83764f5d57b3370e0b04a70f814ca49237a66eea Mon Sep 17 00:00:00 2001 |
Brad Bishop | c1d3433 | 2019-09-09 14:56:00 -0400 | [diff] [blame] | 2 | From: Changqing Li <changqing.li@windriver.com> |
| 3 | Date: Thu, 5 Sep 2019 18:57:39 +0800 |
| 4 | Subject: [PATCH] drbd-utils: support usrmerge |
| 5 | |
| 6 | Upstream-Status: Inappropriate[oe-specific] |
| 7 | |
| 8 | Signed-off-by: Changqing Li <changqing.li@windriver.com> |
Patrick Williams | 5877637 | 2022-04-13 09:07:35 -0500 | [diff] [blame^] | 9 | Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com> |
Brad Bishop | c1d3433 | 2019-09-09 14:56:00 -0400 | [diff] [blame] | 10 | --- |
| 11 | configure.ac | 2 +- |
Patrick Williams | 5877637 | 2022-04-13 09:07:35 -0500 | [diff] [blame^] | 12 | scripts/Makefile.in | 10 +++++----- |
Brad Bishop | c1d3433 | 2019-09-09 14:56:00 -0400 | [diff] [blame] | 13 | user/v83/Makefile.in | 14 +++++++------- |
| 14 | user/v84/Makefile.in | 14 +++++++------- |
Patrick Williams | 5877637 | 2022-04-13 09:07:35 -0500 | [diff] [blame^] | 15 | 4 files changed, 20 insertions(+), 20 deletions(-) |
Brad Bishop | c1d3433 | 2019-09-09 14:56:00 -0400 | [diff] [blame] | 16 | |
| 17 | diff --git a/configure.ac b/configure.ac |
Patrick Williams | 5877637 | 2022-04-13 09:07:35 -0500 | [diff] [blame^] | 18 | index ae575586..3d7deeae 100644 |
Brad Bishop | c1d3433 | 2019-09-09 14:56:00 -0400 | [diff] [blame] | 19 | --- a/configure.ac |
| 20 | +++ b/configure.ac |
Patrick Williams | 5877637 | 2022-04-13 09:07:35 -0500 | [diff] [blame^] | 21 | @@ -180,7 +180,7 @@ AC_ARG_WITH(tmpfilesdir, |
Brad Bishop | c1d3433 | 2019-09-09 14:56:00 -0400 | [diff] [blame] | 22 | AC_SUBST(tmpfilesdir) |
| 23 | |
| 24 | # set default early |
| 25 | -default_udevdir=/lib/udev |
| 26 | +default_udevdir=${prefix}/lib/udev |
| 27 | if test x"$with_udev" = x || \ |
| 28 | test x"$with_udev" = xyes ; then |
| 29 | if test x"$PKG_CONFIG" != x; then |
| 30 | diff --git a/scripts/Makefile.in b/scripts/Makefile.in |
Patrick Williams | 5877637 | 2022-04-13 09:07:35 -0500 | [diff] [blame^] | 31 | index fcd298e9..2521fb08 100644 |
Brad Bishop | c1d3433 | 2019-09-09 14:56:00 -0400 | [diff] [blame] | 32 | --- a/scripts/Makefile.in |
| 33 | +++ b/scripts/Makefile.in |
Patrick Williams | 5877637 | 2022-04-13 09:07:35 -0500 | [diff] [blame^] | 34 | @@ -88,11 +88,11 @@ ifeq ($(subst both,systemd,$(initscripttype)),systemd) |
Brad Bishop | c1d3433 | 2019-09-09 14:56:00 -0400 | [diff] [blame] | 35 | install -d $(DESTDIR)$(systemdunitdir) |
| 36 | install -m 644 drbd.service $(DESTDIR)$(systemdunitdir)/ |
Patrick Williams | 5877637 | 2022-04-13 09:07:35 -0500 | [diff] [blame^] | 37 | install -m 644 $(SYSTEMD_TEMPLATES) $(DESTDIR)$(systemdunitdir)/ |
| 38 | - install -d $(DESTDIR)/lib/drbd/scripts |
| 39 | - install -m 755 drbd $(DESTDIR)/lib/drbd/scripts |
| 40 | - install -m 755 drbd-service-shim.sh $(DESTDIR)/lib/drbd/scripts |
| 41 | - install -m 755 drbd-wait-promotable.sh $(DESTDIR)/lib/drbd/scripts |
| 42 | - install -m 755 ocf.ra.wrapper.sh $(DESTDIR)/lib/drbd/scripts |
| 43 | + install -d $(DESTDIR)/${nonarch_libdir}/drbdscripts |
| 44 | + install -m 755 drbd $(DESTDIR)/${nonarch_libdir}/drbdscripts |
| 45 | + install -m 755 drbd-service-shim.sh $(DESTDIR)/${nonarch_libdir}/drbdscripts |
| 46 | + install -m 755 drbd-wait-promotable.sh $(DESTDIR)/${nonarch_libdir}/drbdscripts |
| 47 | + install -m 755 ocf.ra.wrapper.sh $(DESTDIR)/${nonarch_libdir}/drbdscripts |
Brad Bishop | c1d3433 | 2019-09-09 14:56:00 -0400 | [diff] [blame] | 48 | install -d $(DESTDIR)$(tmpfilesdir)/ |
| 49 | install -m 444 drbd.tmpfiles.conf $(DESTDIR)$(tmpfilesdir)/drbd.conf |
| 50 | endif |
| 51 | diff --git a/user/v83/Makefile.in b/user/v83/Makefile.in |
Patrick Williams | 5877637 | 2022-04-13 09:07:35 -0500 | [diff] [blame^] | 52 | index 08cfe574..4c4971b6 100644 |
Brad Bishop | c1d3433 | 2019-09-09 14:56:00 -0400 | [diff] [blame] | 53 | --- a/user/v83/Makefile.in |
| 54 | +++ b/user/v83/Makefile.in |
| 55 | @@ -96,19 +96,19 @@ install: |
| 56 | ifeq ($(WITH_83_SUPPORT),yes) |
| 57 | install -d $(DESTDIR)$(localstatedir)/lib/drbd |
| 58 | install -d $(DESTDIR)$(localstatedir)/lock |
| 59 | - install -d $(DESTDIR)/lib/drbd/ |
| 60 | + install -d $(DESTDIR)/${nonarch_libdir}/drbd/ |
| 61 | if getent group haclient > /dev/null 2> /dev/null ; then \ |
| 62 | - install -g haclient -m 4750 drbdsetup-83 $(DESTDIR)/lib/drbd/ ; \ |
| 63 | - install -m 755 drbdadm-83 $(DESTDIR)/lib/drbd/ ; \ |
| 64 | + install -g haclient -m 4750 drbdsetup-83 $(DESTDIR)/${nonarch_libdir}/drbd/ ; \ |
| 65 | + install -m 755 drbdadm-83 $(DESTDIR)/${nonarch_libdir}/drbd/ ; \ |
| 66 | else \ |
| 67 | - install -m 755 drbdsetup-83 $(DESTDIR)/lib/drbd/ ; \ |
| 68 | - install -m 755 drbdadm-83 $(DESTDIR)/lib/drbd/ ; \ |
| 69 | + install -m 755 drbdsetup-83 $(DESTDIR)/${nonarch_libdir}/drbd/ ; \ |
| 70 | + install -m 755 drbdadm-83 $(DESTDIR)/${nonarch_libdir}/drbd/ ; \ |
| 71 | fi |
| 72 | endif |
| 73 | |
| 74 | uninstall: |
| 75 | - rm -f $(DESTDIR)/lib/drbd/drbdsetup-83 |
| 76 | - rm -f $(DESTDIR)/lib/drbd/drbdadm-83 |
| 77 | + rm -f $(DESTDIR)/${nonarch_libdir}/drbd/drbdsetup-83 |
| 78 | + rm -f $(DESTDIR)/${nonarch_libdir}/drbd/drbdadm-83 |
| 79 | |
| 80 | .PHONY: install uninstall clean distclean |
| 81 | ../../configure: |
| 82 | diff --git a/user/v84/Makefile.in b/user/v84/Makefile.in |
Patrick Williams | 5877637 | 2022-04-13 09:07:35 -0500 | [diff] [blame^] | 83 | index 0fcefc5f..81f7d5ec 100644 |
Brad Bishop | c1d3433 | 2019-09-09 14:56:00 -0400 | [diff] [blame] | 84 | --- a/user/v84/Makefile.in |
| 85 | +++ b/user/v84/Makefile.in |
Patrick Williams | 5877637 | 2022-04-13 09:07:35 -0500 | [diff] [blame^] | 86 | @@ -110,19 +110,19 @@ ifeq ($(WITH_84_SUPPORT),yes) |
Brad Bishop | c1d3433 | 2019-09-09 14:56:00 -0400 | [diff] [blame] | 87 | install -d $(DESTDIR)$(localstatedir)/lib/drbd |
| 88 | install -d $(DESTDIR)$(localstatedir)/run/drbd |
| 89 | install -d $(DESTDIR)$(localstatedir)/lock |
| 90 | - install -d $(DESTDIR)/lib/drbd/ |
| 91 | + install -d $(DESTDIR)/${nonarch_libdir}/drbd/ |
| 92 | if getent group haclient > /dev/null 2> /dev/null ; then \ |
| 93 | - install -g haclient -m 4750 drbdsetup-84 $(DESTDIR)/lib/drbd/ ; \ |
| 94 | - install -m 755 drbdadm-84 $(DESTDIR)/lib/drbd/ ; \ |
| 95 | + install -g haclient -m 4750 drbdsetup-84 $(DESTDIR)/${nonarch_libdir}/drbd/ ; \ |
| 96 | + install -m 755 drbdadm-84 $(DESTDIR)/${nonarch_libdir}/drbd/ ; \ |
| 97 | else \ |
| 98 | - install -m 755 drbdsetup-84 $(DESTDIR)/lib/drbd/ ; \ |
| 99 | - install -m 755 drbdadm-84 $(DESTDIR)/lib/drbd/ ; \ |
| 100 | + install -m 755 drbdsetup-84 $(DESTDIR)/${nonarch_libdir}/drbd/ ; \ |
| 101 | + install -m 755 drbdadm-84 $(DESTDIR)/${nonarch_libdir}/drbd/ ; \ |
| 102 | fi |
| 103 | endif |
| 104 | |
| 105 | uninstall: |
| 106 | - rm -f $(DESTDIR)/lib/drbd/drbdsetup-84 |
| 107 | - rm -f $(DESTDIR)/lib/drbd/drbdadm-84 |
| 108 | + rm -f $(DESTDIR)/${nonarch_libdir}/drbd/drbdsetup-84 |
| 109 | + rm -f $(DESTDIR)/${nonarch_libdir}/drbd/drbdadm-84 |
| 110 | |
| 111 | spell: |
| 112 | for f in drbdadm_adjust.c drbdadm_main.c drbdadm_parser.c drbdadm_usage_cnt.c drbdsetup.c drbdtool_common.c; do \ |
| 113 | -- |
Patrick Williams | 5877637 | 2022-04-13 09:07:35 -0500 | [diff] [blame^] | 114 | 2.33.0 |
Brad Bishop | c1d3433 | 2019-09-09 14:56:00 -0400 | [diff] [blame] | 115 | |