udev: handle all events - not only class and block devices

[elogind.git] / Makefile

diff --git a/Makefile b/Makefile
index 2a832f70545dc339dc130506c21bf21e282f876f..d36bd5866c6250d75aca6d85a50ee0a2ce4882f8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -50,7 +50,6 @@ INFO =                udevinfo
 TESTER =       udevtest
 STARTER =      udevstart
 VERSION =      058
-INSTALL_DIR =  /usr/local/bin
 RELEASE_NAME = $(ROOT)-$(VERSION)
 LOCAL_CFG_DIR =        etc/udev
 DESTDIR =
@@ -144,7 +143,6 @@ UDEV_OBJS = \
        udev_remove.o           \
        udev_sysfs.o            \
        udev_db.o               \
-       udev_multiplex.o        \
        udev_rules.o            \
        udev_rules_parse.o      \
        udev_libc_wrapper.o
@@ -180,7 +178,6 @@ ifeq ($(strip $(USE_KLIBC)),true)
        KLCC            = $(KLIBC_INSTALL)/bin/klcc
        CC              = $(KLCC)
        LD              = $(KLCC)
-       LDFLAGS         += -static
 else
        CFLAGS          += -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations
 endif
@@ -252,8 +249,8 @@ udev_version.h:
        @echo \#define UDEV_CONFIG_DIR          \"$(configdir)\" >> $@
        @echo \#define UDEV_CONFIG_FILE         \"$(configdir)/udev.conf\" >> $@
        @echo \#define UDEV_RULES_FILE          \"$(configdir)/rules.d\" >> $@
-       @echo \#define UDEV_BIN                 \"$(DESTDIR)$(sbindir)/udev\" >> $@
-       @echo \#define UDEVD_BIN                \"$(DESTDIR)$(sbindir)/udevd\" >> $@
+       @echo \#define UDEV_BIN                 \"$(sbindir)/udev\" >> $@
+       @echo \#define UDEVD_BIN                \"$(sbindir)/udevd\" >> $@
 
 # Rules on how to create the generated config files
 $(LOCAL_CFG_DIR)/udev.conf:
@@ -384,6 +381,7 @@ install: install-config install-man install-dev.d all
        - ln -f -s $(sbindir)/$(SENDER) $(DESTDIR)$(hotplugdir)/10-udev.hotplug
 ifndef DESTDIR
        - killall $(DAEMON)
+       - $(sbindir)/$(DAEMON) -d
        - rm -rf $(udevdb)
 endif
        @extras="$(EXTRAS)" ; for target in $$extras ; do \