[PATCH] udevd - cleanup and better timeout handling

[elogind.git] / Makefile

diff --git a/Makefile b/Makefile
index d43899b9ed61ecf96bee947632735d2f010b037f..d953218f7ba267a1da6418a73f7137b132d1a471 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -232,6 +232,8 @@ udev_version.h:
        @echo \#define UDEV_CONFIG_FILE \"$(configdir)\udev.conf\" >> $@
        @echo \#define UDEV_RULES_FILE  \"$(configdir)\udev.rules\" >> $@
        @echo \#define UDEV_PERMISSION_FILE     \"$(configdir)\udev.permissions\" >> $@
+       @echo \#define UDEV_BIN         \"$(PWD)/udev\" >> $@
+       @echo \#define UDEVD_BIN        \"$(PWD)/udevd\" >> $@
 
 # config files automatically generated
 GEN_CONFIGS =  $(LOCAL_CFG_DIR)/udev.conf
@@ -253,7 +255,7 @@ $(HELPER): udevinfo.o $(OBJS) $(HEADERS)
        $(STRIPCMD) $@
 
 $(DAEMON): udevd.h udevd.o udevd.o logging.o
-       $(LD) $(LDFLAGS) -o $@ $(CRT0) udevd.o logging.o $(LIB_OBJS) $(ARCH_LIB_OBJS)
+       $(LD) $(LDFLAGS) -lpthread -o $@ $(CRT0) udevd.o logging.o $(LIB_OBJS) $(ARCH_LIB_OBJS)
        $(STRIPCMD) $@
 
 $(SENDER): udevd.h udevsend.o udevd.o logging.o
@@ -339,7 +341,7 @@ install: install-config install-dbus-policy all
        $(INSTALL_PROGRAM) -D $(HELPER) $(DESTDIR)$(sbindir)/$(HELPER)
        @if [ "x$(USE_LSB)" = "xtrue" ]; then \
                $(INSTALL_PROGRAM) -D etc/init.d/udev.init.LSB $(DESTDIR)$(initdir)/udev; \
-               ln -s $(DESTDIR)$(initdir)/udev $(sbin_dir)/rcudev; \
+               ln -s $(DESTDIR)$(initdir)/udev $(sbindir)/rcudev; \
        else \
                $(INSTALL_PROGRAM) -D etc/init.d/udev $(DESTDIR)$(initdir)/udev; \
        fi