X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile;h=cd789f82fdfd7c307b2cf2adc24f68ebe6e47264;hp=de305cb9bffb202853d6d9aae9471796e40f8378;hb=d992629180a4bbce84c28456057bf4e9c6bfce6e;hpb=c86be870ce6bb6361ca2ca6c3c05b6d89cf70a2c

diff --git a/Makefile b/Makefile
index de305cb9b..cd789f82f 100644
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 #
 
-VERSION = 075
+VERSION = 077
 
 # set this to make use of syslog
 USE_LOG = true
@@ -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			\
@@ -107,17 +106,15 @@ GEN_CONFIGS = \
 GEN_HEADERS = \
 	udev_version.h
 
-# 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 =
 
@@ -210,7 +207,7 @@ all: $(PROGRAMS) $(MAN_PAGES)
 			LIBUDEV="$(PWD)/$(LIBUDEV)" \
 			LIBSYSFS="$(PWD)/$(LIBSYSFS)" \
 			QUIET="$(QUIET)" \
-			-C $$target $@; \
+			-C $$target $@ || exit 1; \
 	done;
 .PHONY: all
 .DEFAULT: all
@@ -250,11 +247,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
@@ -275,7 +269,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
 
@@ -297,7 +291,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
 
@@ -312,7 +306,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
 
@@ -327,7 +321,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
 
@@ -343,11 +337,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
@@ -363,11 +357,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
 
@@ -383,9 +377,20 @@ test tests: all
 .PHONY: test tests
 
 buildtest:
-	./test/simple-build-check.sh
+	test/simple-build-check.sh
 .PHONY: buildtest
 
+ChangeLog: Makefile
+	@ mv $@ $@.tmp
+	@ echo "Summary of changes from v$(shell printf '%03i' $$(expr $(VERSION) - 1)) to v$(VERSION)" >> $@
+	@ echo "============================================" >> $@
+	@ echo >> $@
+	@ git log --pretty=short $(shell printf '%03i' $$(expr $(VERSION) - 1))..HEAD | git shortlog  >> $@
+	@ echo >> $@
+	@ cat $@
+	@ cat $@.tmp >> $@
+	@ rm $@.tmp
+
 gcov-all:
 	$(MAKE) clean all STRIPCMD= USE_GCOV=true
 	@echo