udev helpers were wrongly installed in /sbin while udev rules
explicitely called them from /lib/udev
Signed-off-by: Olivier Blin <[EMAIL PROTECTED]>
---
Makefile | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/Makefile b/Makefile
index e1d7c85..6f7d9f4 100644
--- a/Makefile
+++ b/Makefile
@@ -80,6 +80,8 @@ hotplugdir = ${etcdir}/hotplug
# place to put our udev rules to
udevrulesdir = ${etcdir}/udev/rules.d
+# place to put our udev helpers to
+udevlibdir = /lib/udev
# place where PCMICIA config is put to
pcmciaconfdir = ${etcdir}/pcmcia
@@ -273,20 +275,20 @@ install-socket-hotplug:
uninstall-socket-hotplug:
- rm -f $(DESTDIR)$(hotplugdir)/pcmcia_socket.agent
$(DESTDIR)$(hotplugdir)/pcmcia_socket.rc
install-socket-tools:
- $(INSTALL_PROGRAM) -D $(PCMCIA_SOCKET_STARTUP)
$(DESTDIR)$(sbindir)/$(PCMCIA_SOCKET_STARTUP)
+ $(INSTALL_PROGRAM) -D $(PCMCIA_SOCKET_STARTUP)
$(DESTDIR)$(udevlibdir)/$(PCMCIA_SOCKET_STARTUP)
uninstall-socket-tools:
- - rm -f $(DESTDIR)$(sbindir)/$(PCMCIA_SOCKET_STARTUP)
+ - rm -f $(DESTDIR)$(udevlibdir)/$(PCMCIA_SOCKET_STARTUP)
install-tools:
- $(INSTALL) -d $(DESTDIR)$(sbindir)
+ $(INSTALL) -d $(DESTDIR)$(sbindir) $(DESTDIR)$(udevlibdir)
$(INSTALL_PROGRAM) -D $(PCCARDCTL) $(DESTDIR)$(sbindir)/$(PCCARDCTL)
- $(INSTALL_PROGRAM) -D $(PCMCIA_CHECK_BROKEN_CIS)
$(DESTDIR)$(sbindir)/$(PCMCIA_CHECK_BROKEN_CIS)
+ $(INSTALL_PROGRAM) -D $(PCMCIA_CHECK_BROKEN_CIS)
$(DESTDIR)$(udevlibdir)/$(PCMCIA_CHECK_BROKEN_CIS)
$(SYMLINK) $(PCCARDCTL) $(DESTDIR)$(sbindir)/$(LSPCMCIA)
uninstall-tools:
- rm -f $(DESTDIR)$(sbindir)/$(PCCARDCTL)
- - rm -f $(DESTDIR)$(sbindir)/$(PCMCIA_CHECK_BROKEN_CIS)
+ - rm -f $(DESTDIR)$(udevlibdir)/$(PCMCIA_CHECK_BROKEN_CIS)
- rm -f $(DESTDIR)$(sbindir)/$(LSPCMCIA)
install-config:
--
1.6.0.1
_______________________________________________
Linux PCMCIA reimplementation list
http://lists.infradead.org/mailman/listinfo/linux-pcmcia
