[PATCH] udevd - config cleanup

[elogind.git] / Makefile

diff --git a/Makefile b/Makefile
index d43899b9ed61ecf96bee947632735d2f010b037f..05d5da5a33447f8bba18291f81f9886d448ebc5c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -38,6 +38,7 @@ VERSION =     015_bk
 INSTALL_DIR =  /usr/local/bin
 RELEASE_NAME = $(ROOT)-$(VERSION)
 LOCAL_CFG_DIR =        etc/udev
+HOTPLUG_EXEC = $(ROOT)
 
 DESTDIR =
 # override this to make udev look in a different location for it's config files
@@ -232,6 +233,10 @@ 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         \"$(DESTDIR)$(sbindir)/udev\" >> $@
+       @echo \#define UDEVD_BIN        \"$(DESTDIR)$(sbindir)/udevd\" >> $@
+       @echo \#define UDEVD_SOCK       \"$(udevdir)/\.udevd.sock\" >> $@
+       @echo \#define UDEVD_LOCK       \"$(udevdir)/\.udevd.lock\" >> $@
 
 # config files automatically generated
 GEN_CONFIGS =  $(LOCAL_CFG_DIR)/udev.conf
@@ -253,7 +258,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
@@ -336,17 +341,19 @@ install: install-config install-dbus-policy all
        $(INSTALL) -d $(DESTDIR)$(udevdir)
        $(INSTALL) -d $(DESTDIR)$(hotplugdir)
        $(INSTALL_PROGRAM) -D $(ROOT) $(DESTDIR)$(sbindir)/$(ROOT)
+       $(INSTALL_PROGRAM) -D $(DAEMON) $(DESTDIR)$(sbindir)/$(DAEMON)
+       $(INSTALL_PROGRAM) -D $(SENDER) $(DESTDIR)$(sbindir)/$(SENDER)
        $(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
        $(INSTALL_DATA) -D udev.8 $(DESTDIR)$(mandir)/man8/udev.8
        $(INSTALL_DATA) -D udevinfo.8 $(DESTDIR)$(mandir)/man8/udevinfo.8
-       - rm -f $(DESTDIR)$(hotplugdir)/udev.hotplug
-       - ln -f -s $(sbindir)/$(ROOT) $(DESTDIR)$(hotplugdir)/udev.hotplug
+       - rm -f $(DESTDIR)$(hotplugdir)/$(HOTPLUG_EXEC).hotplug
+       - ln -f -s $(sbindir)/$(HOTPLUG_EXEC) $(DESTDIR)$(hotplugdir)/udev.hotplug
        @extras="$(EXTRAS)" ; for target in $$extras ; do \
                echo $$target ; \
                $(MAKE) prefix=$(prefix) LD="$(LD)" SYSFS="$(SYSFS)" \
@@ -362,6 +369,8 @@ uninstall: uninstall-dbus-policy
        - rm $(mandir)/man8/udev.8
        - rm $(mandir)/man8/udevinfo.8
        - rm $(sbindir)/$(ROOT)
+       - rm $(sbindir)/$(DAEMON)
+       - rm $(sbindir)/$(SENDER)
        - rm $(sbindir)/$(HELPER)
        - rmdir $(hotplugdir)
        - rmdir $(configdir)