allow programs in /lib/udev called without the path

[elogind.git] / Makefile

diff --git a/Makefile b/Makefile
index c105dab2e28fc5313743423e587337ba296e03ff..48a130491e172292d1c8feb69bc3db82739575e7 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 #
 
-VERSION = 074
+VERSION = 076
 
 # set this to make use of syslog
 USE_LOG = true
@@ -50,7 +50,6 @@ PROGRAMS = \
        udev                            \
        udevd                           \
        udevsend                        \
-       udeveventrecorder               \
        udevcontrol                     \
        udevmonitor                     \
        udevinfo                        \
@@ -61,8 +60,6 @@ HEADERS = \
        udev.h                          \
        udev_utils.h                    \
        udev_rules.h                    \
-       udev_db.h                       \
-       udev_sysfs.h                    \
        logging.h                       \
        udev_libc_wrapper.h             \
        udev_selinux.h                  \
@@ -74,7 +71,6 @@ UDEV_OBJS = \
        udev_config.o                   \
        udev_add.o                      \
        udev_remove.o                   \
-       udev_sysfs.o                    \
        udev_db.o                       \
        udev_rules.o                    \
        udev_rules_parse.o              \
@@ -112,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 =
 
@@ -213,7 +208,7 @@ all: $(PROGRAMS) $(MAN_PAGES)
                        LIBUDEV="$(PWD)/$(LIBUDEV)" \
                        LIBSYSFS="$(PWD)/$(LIBSYSFS)" \
                        QUIET="$(QUIET)" \
-                       -C $$target $@; \
+                       -C $$target $@ || exit 1; \
        done;
 .PHONY: all
 .DEFAULT: all
@@ -253,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
@@ -278,7 +270,7 @@ clean:
        - rm -f udev-$(VERSION).tar.gz
        @extras="$(EXTRAS)"; for target in $$extras; do \
                echo $$target; \
-               $(MAKE) -C $$target $@; \
+               $(MAKE) -C $$target $@ || exit 1; \
        done;
 .PHONY: clean
 
@@ -300,7 +292,7 @@ install-config: $(GEN_CONFIGS)
        fi
        @extras="$(EXTRAS)"; for target in $$extras; do \
                echo $$target; \
-               $(MAKE) -C $$target $@; \
+               $(MAKE) -C $$target $@ || exit 1; \
        done;
 .PHONY: install-config
 
@@ -315,7 +307,7 @@ install-man:
        - ln -f -s udevd.8 $(DESTDIR)$(mandir)/man8/udevcontrol.8
        @extras="$(EXTRAS)"; for target in $$extras; do \
                echo $$target; \
-               $(MAKE) -C $$target $@; \
+               $(MAKE) -C $$target $@ || exit 1; \
        done;
 .PHONY: install-man
 
@@ -330,7 +322,7 @@ uninstall-man:
        - rm -f $(DESTDIR)$(mandir)/man8/udevcontrol.8
        @extras="$(EXTRAS)"; for target in $$extras; do \
                echo $$target; \
-               $(MAKE) -C $$target $@; \
+               $(MAKE) -C $$target $@ || exit 1; \
        done;
 .PHONY: uninstall-man
 
@@ -346,11 +338,11 @@ install-bin:
        $(INSTALL_PROGRAM) -D udevstart $(DESTDIR)$(sbindir)/udevstart
        @extras="$(EXTRAS)"; for target in $$extras; do \
                echo $$target; \
-               $(MAKE) -C $$target $@; \
+               $(MAKE) -C $$target $@ || exit 1; \
        done;
 ifndef DESTDIR
        - killall udevd
-       - rm -rf $(udevdb)
+       - rm -rf /dev/.udev
        - $(sbindir)/udevd --daemon
 endif
 .PHONY: install-bin
@@ -359,7 +351,6 @@ uninstall-bin:
        - rm -f $(DESTDIR)$(sbindir)/udev
        - rm -f $(DESTDIR)$(sbindir)/udevd
        - rm -f $(DESTDIR)$(sbindir)/udevsend
-       - rm -f $(DESTDIR)$(sbindir)/udeveventrecoreder
        - rm -f $(DESTDIR)$(sbindir)/udevcontrol
        - rm -f $(DESTDIR)$(sbindir)/udevstart
        - rm -f $(DESTDIR)$(usrsbindir)/udevmonitor
@@ -367,11 +358,11 @@ 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; \
-               $(MAKE) -C $$target $@; \
+               $(MAKE) -C $$target $@ || exit 1; \
        done;
 .PHONY: uninstall-bin