don't start udevd from udevsend

[elogind.git] / Makefile

diff --git a/Makefile b/Makefile
index de305cb9bffb202853d6d9aae9471796e40f8378..718cf4347d54c7a3058085d4aec63dda6329986f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -60,7 +60,6 @@ HEADERS = \
        udev.h                          \
        udev_utils.h                    \
        udev_rules.h                    \
-       udev_db.h                       \
        logging.h                       \
        udev_libc_wrapper.h             \
        udev_selinux.h                  \
@@ -109,15 +108,14 @@ GEN_HEADERS = \
 
 # override this to make udev look in a different location for it's config files
 prefix =
-exec_prefix =  ${prefix}
 etcdir =       ${prefix}/etc
-sbindir =      ${exec_prefix}/sbin
-usrbindir =    ${exec_prefix}/usr/bin
-usrsbindir =   ${exec_prefix}/usr/sbin
+sbindir =      ${prefix}/sbin
+usrbindir =    ${prefix}/usr/bin
+usrsbindir =   ${prefix}/usr/sbin
+libudevdir =   ${prefix}/lib/udev
 mandir =       ${prefix}/usr/share/man
 configdir =    ${etcdir}/udev
 udevdir =      /dev
-udevdb =       ${udevdir}/.udevdb
 LOCAL_CFG_DIR =        etc/udev
 DESTDIR =
 
@@ -250,11 +248,8 @@ udev_version.h:
        @echo "Creating udev_version.h"
        @echo \#define UDEV_VERSION             \"$(VERSION)\" > $@
        @echo \#define UDEV_ROOT                \"$(udevdir)\" >> $@
-       @echo \#define UDEV_DB                  \"$(udevdb)\" >> $@
-       @echo \#define UDEV_CONFIG_DIR          \"$(configdir)\" >> $@
        @echo \#define UDEV_CONFIG_FILE         \"$(configdir)/udev.conf\" >> $@
        @echo \#define UDEV_RULES_FILE          \"$(configdir)/rules.d\" >> $@
-       @echo \#define UDEVD_BIN                \"$(sbindir)/udevd\" >> $@
 
 # man pages
 %.8: docs/%.xml
@@ -347,7 +342,7 @@ install-bin:
        done;
 ifndef DESTDIR
        - killall udevd
-       - rm -rf $(udevdb)
+       - rm -rf /dev/.udev
        - $(sbindir)/udevd --daemon
 endif
 .PHONY: install-bin
@@ -363,7 +358,7 @@ uninstall-bin:
        - rm -f $(DESTDIR)$(DESTDIR)$(usrbindir)/udevtest
 ifndef DESTDIR
        - killall udevd
-       - rm -rf $(udevdb)
+       - rm -rf /dev/.udev
 endif
        @extras="$(EXTRAS)"; for target in $$extras; do \
                echo $$target; \