multipath-tools/patches/0008-RH-Make-build-system-RH-Fedora-friendly.patch

   1 From f5e11246063b07d6dce6d37d3b74662475baa981 Mon Sep 17 00:00:00 2001
   2 From: Fabio M. Di Nitto <fdinitto@redhat.com>
   3 Date: Thu, 15 Oct 2009 04:39:27 +0200
   4 Subject: [PATCH 08/12] RH: Make build system RH/Fedora friendly
   5
   6 Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
   7 ---
   8 :100644 100644 7ec25d5... 06fb625... M  Makefile.inc
   9 :100644 100644 21e4ad4... 06d79c0... M  kpartx/Makefile
  10 :100644 100644 32d9ef5... 25e1483... M  multipathd/Makefile
  11  Makefile.inc        |    2 +-
  12  kpartx/Makefile     |    8 ++++----
  13  multipathd/Makefile |    1 +
  14  3 files changed, 6 insertions(+), 5 deletions(-)
  15
  16 diff --git a/Makefile.inc b/Makefile.inc
  17 index 7ec25d5..06fb625 100644
  18 --- a/Makefile.inc
  19 +++ b/Makefile.inc
  20 @@ -28,7 +28,7 @@ libudevdir  = ${prefix}/lib/udev
  21  multipathdir = $(TOPDIR)/libmultipath
  22  mandir      = $(prefix)/usr/share/man/man8
  23  man5dir     = $(prefix)/usr/share/man/man5
  24 -rcdir      = $(prefix)/etc/init.d
  25 +rcdir      = $(prefix)/etc/rc.d/init.d
  26  syslibdir   = $(prefix)/$(LIB)
  27  libdir     = $(prefix)/$(LIB)/multipath
  28
  29 diff --git a/kpartx/Makefile b/kpartx/Makefile
  30 index 21e4ad4..06d79c0 100644
  31 --- a/kpartx/Makefile
  32 +++ b/kpartx/Makefile
  33 @@ -20,10 +20,10 @@ $(EXEC): $(OBJS)
  34  install: $(EXEC) $(EXEC).8
  35         $(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir)
  36         $(INSTALL_PROGRAM) -m 755 $(EXEC) $(DESTDIR)$(bindir)
  37 -       $(INSTALL_PROGRAM) -d $(DESTDIR)$(libudevdir)
  38 -       $(INSTALL_PROGRAM) -m 755 kpartx_id $(DESTDIR)$(libudevdir)
  39 -       $(INSTALL_PROGRAM) -d $(DESTDIR)/etc/udev/rules.d
  40 -       $(INSTALL_PROGRAM) -m 644 kpartx.rules $(DESTDIR)/etc/udev/rules.d/
  41 +#      $(INSTALL_PROGRAM) -d $(DESTDIR)$(libudevdir)
  42 +#      $(INSTALL_PROGRAM) -m 755 kpartx_id $(DESTDIR)$(libudevdir)
  43 +#      $(INSTALL_PROGRAM) -d $(DESTDIR)/etc/udev/rules.d
  44 +#      $(INSTALL_PROGRAM) -m 644 kpartx.rules $(DESTDIR)/etc/udev/rules.d/
  45         $(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir)
  46         $(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir)
  47
  48 diff --git a/multipathd/Makefile b/multipathd/Makefile
  49 index 32d9ef5..25e1483 100644
  50 --- a/multipathd/Makefile
  51 +++ b/multipathd/Makefile
  52 @@ -35,6 +35,7 @@ install:
  53         $(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir)
  54         $(INSTALL_PROGRAM) -m 755 $(EXEC) $(DESTDIR)$(bindir)
  55         $(INSTALL_PROGRAM) -d $(DESTDIR)$(rcdir)
  56 +       $(INSTALL_PROGRAM) -m 755 multipathd.init.redhat $(DESTDIR)$(rcdir)/$(EXEC)
  57         $(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir)
  58         $(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir)
  59
  60 --
  61 1.6.5.1
  62