X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile;h=718cf4347d54c7a3058085d4aec63dda6329986f;hb=4389ec08fb177f62fc02eb2217fed126aef3a7a3;hp=c105dab2e28fc5313743423e587337ba296e03ff;hpb=f054627f500450a7aadeaf8a9930354fb268718e;p=elogind.git

diff --git a/Makefile b/Makefile
index c105dab2e..718cf4347 100644
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 #
 
-VERSION = 074
+VERSION = 075
 
 # 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 =
 
@@ -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
@@ -350,7 +342,7 @@ install-bin:
 	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,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; \