1From 642b5823abeee27a0fdc2d12d0e1235461ace9ed Mon Sep 17 00:00:00 2001 2From: Changqing Li <changqing.li@windriver.com> 3Date: Thu, 5 Sep 2019 18:57:39 +0800 4Subject: [PATCH] drbd-utils: support usrmerge 5 6Upstream-Status: Inappropriate[oe-specific] 7 8Signed-off-by: Changqing Li <changqing.li@windriver.com> 9--- 10 configure.ac | 2 +- 11 scripts/Makefile.in | 4 ++-- 12 user/v83/Makefile.in | 14 +++++++------- 13 user/v84/Makefile.in | 14 +++++++------- 14 4 files changed, 17 insertions(+), 17 deletions(-) 15 16diff --git a/configure.ac b/configure.ac 17index 4df1b4d..c4ef1bc 100644 18--- a/configure.ac 19+++ b/configure.ac 20@@ -176,7 +176,7 @@ AC_ARG_WITH(tmpfilesdir, 21 AC_SUBST(tmpfilesdir) 22 23 # set default early 24-default_udevdir=/lib/udev 25+default_udevdir=${prefix}/lib/udev 26 if test x"$with_udev" = x || \ 27 test x"$with_udev" = xyes ; then 28 if test x"$PKG_CONFIG" != x; then 29diff --git a/scripts/Makefile.in b/scripts/Makefile.in 30index fbb0beb..da701a1 100644 31--- a/scripts/Makefile.in 32+++ b/scripts/Makefile.in 33@@ -75,8 +75,8 @@ endif 34 ifeq ($(subst both,systemd,$(initscripttype)),systemd) 35 install -d $(DESTDIR)$(systemdunitdir) 36 install -m 644 drbd.service $(DESTDIR)$(systemdunitdir)/ 37- install -d $(DESTDIR)/lib/drbd/ 38- install -m 755 drbd $(DESTDIR)/lib/drbd/ 39+ install -d $(DESTDIR)/${nonarch_libdir}/drbd 40+ install -m 755 drbd $(DESTDIR)/${nonarch_libdir}/drbd 41 install -d $(DESTDIR)$(tmpfilesdir)/ 42 install -m 444 drbd.tmpfiles.conf $(DESTDIR)$(tmpfilesdir)/drbd.conf 43 endif 44diff --git a/user/v83/Makefile.in b/user/v83/Makefile.in 45index 27516de..b301376 100644 46--- a/user/v83/Makefile.in 47+++ b/user/v83/Makefile.in 48@@ -96,19 +96,19 @@ install: 49 ifeq ($(WITH_83_SUPPORT),yes) 50 install -d $(DESTDIR)$(localstatedir)/lib/drbd 51 install -d $(DESTDIR)$(localstatedir)/lock 52- install -d $(DESTDIR)/lib/drbd/ 53+ install -d $(DESTDIR)/${nonarch_libdir}/drbd/ 54 if getent group haclient > /dev/null 2> /dev/null ; then \ 55- install -g haclient -m 4750 drbdsetup-83 $(DESTDIR)/lib/drbd/ ; \ 56- install -m 755 drbdadm-83 $(DESTDIR)/lib/drbd/ ; \ 57+ install -g haclient -m 4750 drbdsetup-83 $(DESTDIR)/${nonarch_libdir}/drbd/ ; \ 58+ install -m 755 drbdadm-83 $(DESTDIR)/${nonarch_libdir}/drbd/ ; \ 59 else \ 60- install -m 755 drbdsetup-83 $(DESTDIR)/lib/drbd/ ; \ 61- install -m 755 drbdadm-83 $(DESTDIR)/lib/drbd/ ; \ 62+ install -m 755 drbdsetup-83 $(DESTDIR)/${nonarch_libdir}/drbd/ ; \ 63+ install -m 755 drbdadm-83 $(DESTDIR)/${nonarch_libdir}/drbd/ ; \ 64 fi 65 endif 66 67 uninstall: 68- rm -f $(DESTDIR)/lib/drbd/drbdsetup-83 69- rm -f $(DESTDIR)/lib/drbd/drbdadm-83 70+ rm -f $(DESTDIR)/${nonarch_libdir}/drbd/drbdsetup-83 71+ rm -f $(DESTDIR)/${nonarch_libdir}/drbd/drbdadm-83 72 73 .PHONY: install uninstall clean distclean 74 ../../configure: 75diff --git a/user/v84/Makefile.in b/user/v84/Makefile.in 76index 38977c6..05ef060 100644 77--- a/user/v84/Makefile.in 78+++ b/user/v84/Makefile.in 79@@ -109,19 +109,19 @@ ifeq ($(WITH_84_SUPPORT),yes) 80 install -d $(DESTDIR)$(localstatedir)/lib/drbd 81 install -d $(DESTDIR)$(localstatedir)/run/drbd 82 install -d $(DESTDIR)$(localstatedir)/lock 83- install -d $(DESTDIR)/lib/drbd/ 84+ install -d $(DESTDIR)/${nonarch_libdir}/drbd/ 85 if getent group haclient > /dev/null 2> /dev/null ; then \ 86- install -g haclient -m 4750 drbdsetup-84 $(DESTDIR)/lib/drbd/ ; \ 87- install -m 755 drbdadm-84 $(DESTDIR)/lib/drbd/ ; \ 88+ install -g haclient -m 4750 drbdsetup-84 $(DESTDIR)/${nonarch_libdir}/drbd/ ; \ 89+ install -m 755 drbdadm-84 $(DESTDIR)/${nonarch_libdir}/drbd/ ; \ 90 else \ 91- install -m 755 drbdsetup-84 $(DESTDIR)/lib/drbd/ ; \ 92- install -m 755 drbdadm-84 $(DESTDIR)/lib/drbd/ ; \ 93+ install -m 755 drbdsetup-84 $(DESTDIR)/${nonarch_libdir}/drbd/ ; \ 94+ install -m 755 drbdadm-84 $(DESTDIR)/${nonarch_libdir}/drbd/ ; \ 95 fi 96 endif 97 98 uninstall: 99- rm -f $(DESTDIR)/lib/drbd/drbdsetup-84 100- rm -f $(DESTDIR)/lib/drbd/drbdadm-84 101+ rm -f $(DESTDIR)/${nonarch_libdir}/drbd/drbdsetup-84 102+ rm -f $(DESTDIR)/${nonarch_libdir}/drbd/drbdadm-84 103 104 spell: 105 for f in drbdadm_adjust.c drbdadm_main.c drbdadm_parser.c drbdadm_usage_cnt.c drbdsetup.c drbdtool_common.c; do \ 106-- 1072.7.4 108 109