X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile;h=1c1280a7dcddb636d7fa3bb22cb79d4407ac9245;hb=db481105c2cf2092e1499736d6619bf194f91711;hp=ecc798de89ca5f7177dbd96a12fe980896dbf95c;hpb=59d6bfefceac1a31b0408e60cd251b5035cf3b50;p=elogind.git

diff --git a/Makefile b/Makefile
index ecc798de8..1c1280a7d 100644
--- 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 =	065
+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 = .
@@ -356,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:
@@ -382,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)
@@ -408,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)