Makefile: use UDEVRULESDIR instead of UDEVDIR

The SUSE rpm macros only have UDEVRULESDIR, not UDEVDIR.
So introduce a UDEVRULESDIR variable which is preset to
UDEVDIR/rules.d

Signed-off-by: Hannes Reinecke <hare@suse.de>

diff --git a/Makefile b/Makefile
index 03d57d3396e678d845a84db25261db05b5dfa624..e63a9cb468af7535dc5d53e0b08e7d4a7faa3a86 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -13,6 +13,7 @@ SBINDIR = $(PREFIX)/sbin
 LIBDIR ?= $(PREFIX)/lib
 SYSTEMDDIR ?= $(LIBDIR)/systemd
 UDEVDIR ?= $(SYSCONFDIR)/udev
+UDEVRULESDIR ?= $(UDEVDIR)/rules.d
 DRACUTDIR ?= $(LIBDIR)/dracut
 LIB_DEPENDS =
 
@@ -125,8 +126,8 @@ install-systemd:
        $(INSTALL) -m 644 ./nvmf-autoconnect/systemd/* $(DESTDIR)$(SYSTEMDDIR)/system
 
 install-udev:
-       $(INSTALL) -d $(DESTDIR)$(UDEVDIR)/rules.d
-       $(INSTALL) -m 644 ./nvmf-autoconnect/udev-rules/* $(DESTDIR)$(UDEVDIR)/rules.d
+       $(INSTALL) -d $(DESTDIR)$(UDEVRULESDIR)
+       $(INSTALL) -m 644 ./nvmf-autoconnect/udev-rules/* $(DESTDIR)$(UDEVRULESDIR)
 
 install-dracut: 70-nvmf-autoconnect.conf
        $(INSTALL) -d $(DESTDIR)$(DRACUTDIR)/dracut.conf.d
@@ -160,7 +161,7 @@ nvme.spec: nvme.spec.in NVME-VERSION-FILE
        mv $@+ $@
 
 70-nvmf-autoconnect.conf: nvmf-autoconnect/dracut-conf/70-nvmf-autoconnect.conf.in
-       sed -e 's#@@UDEVDIR@@#$(UDEVDIR)#g' < $< > $@+
+       sed -e 's#@@UDEVRULESDIR@@#$(UDEVRULESDIR)#g' < $< > $@+
        mv $@+ $@
 
 dist: nvme.spec

diff --git a/nvmf-autoconnect/dracut-conf/70-nvmf-autoconnect.conf.in b/nvmf-autoconnect/dracut-conf/70-nvmf-autoconnect.conf.in
index d1f02fe36596041fbbaf1da9469d4f2c8472c93a..41ea83cc484c4c5eb70f5ae8b689c4a84dce7806 100644 (file)
--- a/nvmf-autoconnect/dracut-conf/70-nvmf-autoconnect.conf.in
+++ b/nvmf-autoconnect/dracut-conf/70-nvmf-autoconnect.conf.in
@@ -1 +1 @@
-install_items+="@@UDEVDIR@@/rules.d/70-nvmf-autoconnect.rules"
+install_items+="@@UDEVRULESDIR@@/70-nvmf-autoconnect.rules"