Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 1 | From a6eab413f274376cf703a608e2866118291a6185 Mon Sep 17 00:00:00 2001 |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 2 | From: Amarnath Valluri <amarnath.valluri@intel.com> |
| 3 | Date: Thu, 9 Feb 2017 11:02:53 +0200 |
| 4 | Subject: [PATCH] Make udev rules directory configurable. |
| 5 | |
| 6 | udev rules directory can be configurable via undevrulesdir variable. And use |
| 7 | libdir, sbindir for installing librares and binaries. |
| 8 | |
| 9 | Upstream-Status: Inappropriate[Embedded specific] |
| 10 | |
| 11 | Signed-off-by: Amarnath Valluri <amarnath.valluri@intel.com> |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 12 | |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 13 | --- |
| 14 | configure.ac | 14 +++----------- |
| 15 | data/Makefile.am | 1 - |
| 16 | src/probers/Makefile.am | 2 +- |
| 17 | tools/Makefile.am | 2 +- |
| 18 | 4 files changed, 5 insertions(+), 14 deletions(-) |
| 19 | |
| 20 | diff --git a/configure.ac b/configure.ac |
| 21 | index 8c4e4c2..a143397 100644 |
| 22 | --- a/configure.ac |
| 23 | +++ b/configure.ac |
| 24 | @@ -227,15 +227,8 @@ if test "x$GCC" = "xyes"; then |
| 25 | LDFLAGS="-Wl,--as-needed $LDFLAGS" |
| 26 | fi |
| 27 | |
| 28 | -if test "$prefix" = "/usr" -o "$prefix" = "/usr/local" ; then |
| 29 | - slashlibdir=/lib |
| 30 | - slashsbindir=/sbin |
| 31 | -else |
| 32 | - slashlibdir=$prefix/lib |
| 33 | - slashsbindir=$prefix/sbin |
| 34 | -fi |
| 35 | -AC_SUBST(slashlibdir) |
| 36 | -AC_SUBST(slashsbindir) |
| 37 | +udevrulesdir=/lib/udev/udev.d |
| 38 | +AC_SUBST(udevrulesdir) |
| 39 | |
| 40 | # ************* |
| 41 | # Remote Access |
| 42 | @@ -299,8 +292,7 @@ echo " |
| 43 | sysconfdir: ${sysconfdir} |
| 44 | localstatedir: ${localstatedir} |
| 45 | docdir: ${docdir} |
| 46 | - slashlibdir: ${slashlibdir} |
| 47 | - slashsbindir: ${slashsbindir} |
| 48 | + udevrulesdir: ${udevrulesdir} |
| 49 | systemdsystemunitdir: ${systemdsystemunitdir} |
| 50 | |
| 51 | compiler: ${CC} |
| 52 | diff --git a/data/Makefile.am b/data/Makefile.am |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 53 | index 08af5f4..9329186 100644 |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 54 | --- a/data/Makefile.am |
| 55 | +++ b/data/Makefile.am |
| 56 | @@ -34,7 +34,6 @@ $(systemdservice_DATA): $(systemdservice_in_files) Makefile |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 57 | @sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 58 | endif |
| 59 | |
| 60 | -udevrulesdir = $(slashlibdir)/udev/rules.d |
| 61 | udevrules_DATA = 80-udisks.rules |
| 62 | |
| 63 | pkgconfigdir = $(datadir)/pkgconfig |
| 64 | diff --git a/src/probers/Makefile.am b/src/probers/Makefile.am |
| 65 | index 01c693b..6a0361a 100644 |
| 66 | --- a/src/probers/Makefile.am |
| 67 | +++ b/src/probers/Makefile.am |
| 68 | @@ -20,7 +20,7 @@ INCLUDES = \ |
| 69 | # TODO: ideally move most of this to udev and/or util-linux |
| 70 | # |
| 71 | |
| 72 | -udevhelperdir = $(slashlibdir)/udev |
| 73 | +udevhelperdir = $(libdir)/udev |
| 74 | udevhelper_PROGRAMS = udisks-part-id \ |
| 75 | udisks-probe-sas-expander \ |
| 76 | $(NULL) |
| 77 | diff --git a/tools/Makefile.am b/tools/Makefile.am |
| 78 | index 18325f7..0aaec11 100644 |
| 79 | --- a/tools/Makefile.am |
| 80 | +++ b/tools/Makefile.am |
| 81 | @@ -54,7 +54,7 @@ udisks_LDADD = \ |
| 82 | $(DBUS_GLIB_LIBS) \ |
| 83 | $(POLKIT_DBUS_LIBS) |
| 84 | |
| 85 | -slashsbin_PROGRAMS = umount.udisks |
| 86 | +sbin_PROGRAMS = umount.udisks |
| 87 | |
| 88 | umount_udisks_SOURCES = umount-udisks.c |
| 89 | umount_udisks_LDADD = $(DBUS_GLIB_LIBS) $(POLKIT_DBUS_LIBS) |