DRBD 8.3.7 user/Makefile.in patch

Drbd-dev Deftunix 2 participants 2 messages Sep 25, 2010 – Oct 5, 2010 DRBD driver

Share & tools

Deftunix

author

2010-09-25 11:11 UTC #0 lore raw

Hi all,

i've found a little problem when installing drbd 8.3.7 from source. It installs binary only related to $(DESTDIR) disregarding $(sbindir).

Kind regards,

-- deftunix

user/Makefile.in 2010-09-25 12:26:17.963038793 +0200 renamed from user/Makefile.in.orig 2010-01-13 17:04:50.000000000 +0100 +10 -9

@@ -98,23 +98,24 @@ distclean: clean
 
 install:
 ifeq ($(WITH_UTILS),yes)
-       install -d $(DESTDIR)/sbin/
+       install -d $(DESTDIR)$(sbindir)
        install -d $(DESTDIR)$(localstatedir)/lib/drbd
        install -d $(DESTDIR)$(localstatedir)/lock
        if getent group haclient > /dev/null 2> /dev/null ; then        \
-               install -g haclient -m 4750 drbdsetup $(DESTDIR)/sbin/ ;        \
-               install -g haclient -m 4750 drbdmeta $(DESTDIR)/sbin/ ; \
-               install -m 755 drbdadm $(DESTDIR)/sbin/ ;               \
+               install -g haclient -m 4750 drbdsetup $(DESTDIR)$(sbindir)/ ;   \
+               install -g haclient -m 4750 drbdmeta $(DESTDIR)$(sbindir)/ ;    \
+               install -m 755 drbdadm $(DESTDIR)$(sbindir)/ ;          \
        else                                                            \
-               install -m 755 drbdsetup $(DESTDIR)/sbin/ ;             \
-               install -m 755 drbdmeta $(DESTDIR)/sbin/ ;              \
-               install -m 755 drbdadm $(DESTDIR)/sbin/ ;               \
+               install -m 755 drbdsetup $(DESTDIR)$(sbindir)/ ;                \
+               install -m 755 drbdmeta $(DESTDIR)$(sbindir)/ ;         \
+               install -m 755 drbdadm $(DESTDIR)$(sbindir)/ ;          \
        fi
 endif
 
 uninstall:
-       rm -f $(DESTDIR)/sbin/drbdsetup
-       rm -f $(DESTDIR)/sbin/drbdadm
+       rm -f $(DESTDIR)$(sbindir)/drbdsetup
+       rm -f $(DESTDIR)$(sbindir)/drbdmeta
+       rm -f $(DESTDIR)$(sbindir)/drbdadm
 
 spell:
        for f in drbdadm_adjust.c drbdadm_main.c drbdadm_parser.c drbdadm_usage_cnt.c drbdmeta.c drbdsetup.c drbdtool_common.c; do \

Lars Ellenberg

maintainer

2010-10-05 19:19 UTC #1 lore raw

Quoted 9 lines · Deftunix

Hi all,
i've found a little problem when installing drbd 8.3.7 from source. It installs binary only related to $(DESTDIR) disregarding $(sbindir).
Kind regards,
-- deftunix

I think that has been intentional, as drbdsetup may be necessary early during boot, we really want it in /sbin, not in /usr/sbin, or /usr/local/sbin/ or whatever.

If there is a "autofoo configure" variable for /sbin/ equivalent (as opposed to /usr/sbin/ equivalent), please let me know.

Quoted 8 lines

user/Makefile.in 2010-09-25 12:26:17.963038793 +0200 renamed from user/Makefile.in.orig 2010-01-13 17:04:50.000000000 +0100 +1 -1
@@ -98,23 +98,24 @@ distclean: clean
 
 install:
 ifeq ($(WITH_UTILS),yes)
-       install -d $(DESTDIR)/sbin/
+       install -d $(DESTDIR)$(sbindir)

...

Signature · 7 lines

: Lars Ellenberg
: LINBIT | Your Way to High Availability
: DRBD/HA support and consulting http://www.linbit.com

DRBD® and LINBIT® are registered trademarks of LINBIT, Austria.
__
please don't Cc me, but send to list   --   I'm subscribed