prepare for new HAL udevdb dump

[elogind.git] / Makefile

diff --git a/Makefile b/Makefile
index 5eb93bd500bdfbc6abfcdc65727a4a8e1b8119ad..1c1280a7dcddb636d7fa3bb22cb79d4407ac9245 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -41,7 +41,7 @@ EXTRAS=
 # make the build silent. Set this to something else to make it noisy again.
 V=false
 
-VERSION =      064
+VERSION =      068
 ROOT =         udev
 DAEMON =       udevd
 SENDER =       udevsend
@@ -64,6 +64,7 @@ exec_prefix = ${prefix}
 etcdir =       ${prefix}/etc
 sbindir =      ${exec_prefix}/sbin
 usrbindir =    ${exec_prefix}/usr/bin
+usrsbindir =   ${exec_prefix}/usr/sbin
 mandir =       ${prefix}/usr/share/man
 configdir =    ${etcdir}/udev
 srcdir = .
@@ -136,7 +137,6 @@ SYSFS_OBJS = \
        libsysfs/dlist.o
 
 UDEV_OBJS = \
-       udev_utils.o                    \
        udev_event.o                    \
        udev_device.o                   \
        udev_config.o                   \
@@ -146,6 +146,9 @@ UDEV_OBJS = \
        udev_db.o                       \
        udev_rules.o                    \
        udev_rules_parse.o              \
+       udev_utils.o                    \
+       udev_utils_file.o               \
+       udev_utils_run.o                \
        udev_libc_wrapper.o
 
 OBJS = \
@@ -354,8 +357,9 @@ install-config:
                $(INSTALL_DATA) $(LOCAL_CFG_DIR)/udev.conf $(DESTDIR)$(configdir); \
        fi
        @if [ ! -r $(DESTDIR)$(configdir)/rules.d/50-udev.rules ]; then \
-               echo $(INSTALL_DATA) $(LOCAL_CFG_DIR)/udev.rules $(DESTDIR)$(configdir)/rules.d/50-udev.rules; \
-               $(INSTALL_DATA) $(LOCAL_CFG_DIR)/udev.rules $(DESTDIR)$(configdir)/rules.d/50-udev.rules; \
+               echo ; \
+               echo "pick a udev rules file from the etc/udev directory that matches your distribution"; \
+               echo ; \
        fi
 
 install-man:
@@ -380,7 +384,7 @@ install: install-config install-man all
        $(INSTALL_PROGRAM) -D $(DAEMON) $(DESTDIR)$(sbindir)/$(DAEMON)
        $(INSTALL_PROGRAM) -D $(SENDER) $(DESTDIR)$(sbindir)/$(SENDER)
        $(INSTALL_PROGRAM) -D $(CONTROL) $(DESTDIR)$(sbindir)/$(CONTROL)
-       $(INSTALL_PROGRAM) -D $(MONITOR) $(DESTDIR)$(sbindir)/$(MONITOR)
+       $(INSTALL_PROGRAM) -D $(MONITOR) $(DESTDIR)$(usrsbindir)/$(MONITOR)
        $(INSTALL_PROGRAM) -D $(INFO) $(DESTDIR)$(usrbindir)/$(INFO)
        $(INSTALL_PROGRAM) -D $(TESTER) $(DESTDIR)$(usrbindir)/$(TESTER)
        $(INSTALL_PROGRAM) -D $(STARTER) $(DESTDIR)$(sbindir)/$(STARTER)
@@ -406,8 +410,8 @@ uninstall: uninstall-man
        - rm $(sbindir)/$(INITSENDER)
        - rm $(sbindir)/$(RECORDER)
        - rm $(sbindir)/$(CONTROL)
-       - rm $(sbindir)/$(MONITOR)
        - rm $(sbindir)/$(STARTER)
+       - rm $(usrsbindir)/$(MONITOR)
        - rm $(usrbindir)/$(INFO)
        - rm $(usrbindir)/$(TESTER)
        - rm -rf $(udevdb)