X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile;h=54bfb31cd32e85317ae568884cd6f1811169ba6b;hb=c699bc48e1432bc1b283907a52e461b97f2e45b1;hp=4968df42616b6cdffe8b416d4f8dfe0f7f4a9f8f;hpb=fc55cf68ca0c0db5172a9de7e827c6c3f7c2a308;p=elogind.git

diff --git a/Makefile b/Makefile
index 4968df426..54bfb31cd 100644
--- a/Makefile
+++ b/Makefile
@@ -108,11 +108,11 @@ 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
@@ -208,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
@@ -248,10 +248,8 @@ udev_version.h:
 	@echo "Creating udev_version.h"
 	@echo \#define UDEV_VERSION		\"$(VERSION)\" > $@
 	@echo \#define UDEV_ROOT		\"$(udevdir)\" >> $@
-	@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
@@ -272,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
 
@@ -294,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
 
@@ -309,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
 
@@ -324,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
 
@@ -340,7 +338,7 @@ 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
@@ -364,7 +362,7 @@ ifndef DESTDIR
 endif
 	@extras="$(EXTRAS)"; for target in $$extras; do \
 		echo $$target; \
-		$(MAKE) -C $$target $@; \
+		$(MAKE) -C $$target $@ || exit 1; \
 	done;
 .PHONY: uninstall-bin