* [PATCH] query udev dir via pkg-config
@ 2012-08-13 17:44 Mike Frysinger
2012-08-13 23:47 ` NeilBrown
0 siblings, 1 reply; 3+ messages in thread
From: Mike Frysinger @ 2012-08-13 17:44 UTC (permalink / raw)
To: NeilBrown; +Cc: linux-raid, Samuli Suominen
From: Samuli Suominen <ssuominen@gentoo.org>
Since udev is moving its internal dir around, query it via pkg-config
rather than hardcoding the old path. This should work with new/old
versions.
Signed-off-by: Samuli Suominen <ssuominen@gentoo.org>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
Makefile | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 72f609e..a3e4027 100644
--- a/Makefile
+++ b/Makefile
@@ -57,6 +57,8 @@ else
DEFAULT_METADATA=1.2
endif
+PKG_CONFIG ?= pkg-config
+
SYSCONFDIR = /etc
CONFFILE = $(SYSCONFDIR)/mdadm.conf
CONFFILE2 = $(SYSCONFDIR)/mdadm/mdadm.conf
@@ -96,6 +98,11 @@ MAN4DIR = $(MANDIR)/man4
MAN5DIR = $(MANDIR)/man5
MAN8DIR = $(MANDIR)/man8
+UDEVDIR := $(shell $(PKG_CONFIG) --variable=udevdir udev 2>/dev/null)
+ifndef UDEVDIR
+ UDEVDIR = /lib/udev
+endif
+
OBJS = mdadm.o config.o policy.o mdstat.o ReadMe.o util.o maps.o lib.o \
Manage.o Assemble.o Build.o \
Create.o Detail.o Examine.o Grow.o Monitor.o dlink.o Kill.o Query.o \
@@ -255,7 +262,7 @@ install-man: mdadm.8 md.4 mdadm.conf.5 mdmon.8
$(INSTALL) -D -m 644 mdadm.conf.5 $(DESTDIR)$(MAN5DIR)/mdadm.conf.5
install-udev: udev-md-raid.rules
- $(INSTALL) -D -m 644 udev-md-raid.rules $(DESTDIR)/lib/udev/rules.d/64-md-raid.rules
+ $(INSTALL) -D -m 644 udev-md-raid.rules $(DESTDIR)$(UDEVDIR)/rules.d/64-md-raid.rules
uninstall:
rm -f $(DESTDIR)$(MAN8DIR)/mdadm.8 $(DESTDIR)$(MAN8DIR)/mdmon.8 $(DESTDIR)$(MAN4DIR)/md.4 $(DESTDIR)$(MAN5DIR)/mdadm.conf.5 $(DESTDIR)$(BINDIR)/mdadm
--
1.7.9.7
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] query udev dir via pkg-config
2012-08-13 17:44 [PATCH] query udev dir via pkg-config Mike Frysinger
@ 2012-08-13 23:47 ` NeilBrown
2012-08-14 3:00 ` Mike Frysinger
0 siblings, 1 reply; 3+ messages in thread
From: NeilBrown @ 2012-08-13 23:47 UTC (permalink / raw)
To: Mike Frysinger; +Cc: linux-raid, Samuli Suominen
[-- Attachment #1: Type: text/plain, Size: 1865 bytes --]
On Mon, 13 Aug 2012 13:44:22 -0400 Mike Frysinger <vapier@gentoo.org> wrote:
> From: Samuli Suominen <ssuominen@gentoo.org>
>
> Since udev is moving its internal dir around, query it via pkg-config
> rather than hardcoding the old path. This should work with new/old
> versions.
>
> Signed-off-by: Samuli Suominen <ssuominen@gentoo.org>
> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
> ---
> Makefile | 9 ++++++++-
> 1 file changed, 8 insertions(+), 1 deletion(-)
>
> diff --git a/Makefile b/Makefile
> index 72f609e..a3e4027 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -57,6 +57,8 @@ else
> DEFAULT_METADATA=1.2
> endif
>
> +PKG_CONFIG ?= pkg-config
> +
> SYSCONFDIR = /etc
> CONFFILE = $(SYSCONFDIR)/mdadm.conf
> CONFFILE2 = $(SYSCONFDIR)/mdadm/mdadm.conf
> @@ -96,6 +98,11 @@ MAN4DIR = $(MANDIR)/man4
> MAN5DIR = $(MANDIR)/man5
> MAN8DIR = $(MANDIR)/man8
>
> +UDEVDIR := $(shell $(PKG_CONFIG) --variable=udevdir udev 2>/dev/null)
> +ifndef UDEVDIR
> + UDEVDIR = /lib/udev
> +endif
> +
> OBJS = mdadm.o config.o policy.o mdstat.o ReadMe.o util.o maps.o lib.o \
> Manage.o Assemble.o Build.o \
> Create.o Detail.o Examine.o Grow.o Monitor.o dlink.o Kill.o Query.o \
> @@ -255,7 +262,7 @@ install-man: mdadm.8 md.4 mdadm.conf.5 mdmon.8
> $(INSTALL) -D -m 644 mdadm.conf.5 $(DESTDIR)$(MAN5DIR)/mdadm.conf.5
>
> install-udev: udev-md-raid.rules
> - $(INSTALL) -D -m 644 udev-md-raid.rules $(DESTDIR)/lib/udev/rules.d/64-md-raid.rules
> + $(INSTALL) -D -m 644 udev-md-raid.rules $(DESTDIR)$(UDEVDIR)/rules.d/64-md-raid.rules
>
> uninstall:
> rm -f $(DESTDIR)$(MAN8DIR)/mdadm.8 $(DESTDIR)$(MAN8DIR)/mdmon.8 $(DESTDIR)$(MAN4DIR)/md.4 $(DESTDIR)$(MAN5DIR)/mdadm.conf.5 $(DESTDIR)$(BINDIR)/mdadm
Applied - thanks....
So where is /lib/udev being moved to?
NeilBrown
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 828 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] query udev dir via pkg-config
2012-08-13 23:47 ` NeilBrown
@ 2012-08-14 3:00 ` Mike Frysinger
0 siblings, 0 replies; 3+ messages in thread
From: Mike Frysinger @ 2012-08-14 3:00 UTC (permalink / raw)
To: NeilBrown; +Cc: linux-raid, Samuli Suominen
[-- Attachment #1: Type: Text/Plain, Size: 112 bytes --]
On Monday 13 August 2012 19:47:59 NeilBrown wrote:
> So where is /lib/udev being moved to?
/usr/lib/udev
-mike
[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-08-14 3:00 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-08-13 17:44 [PATCH] query udev dir via pkg-config Mike Frysinger
2012-08-13 23:47 ` NeilBrown
2012-08-14 3:00 ` Mike Frysinger
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).