X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile;h=162e353c76fd5bdbe22914f9a2161992de2f06cb;hp=cf8c1d1eedd2a1fdcbf2799175fd6f70b00d0c7b;hb=9bbdf6eb3c0d84bf906176a51e4cda10882dadc6;hpb=8325c84dba74ef8b9bd10d5dc5e4d0ec2574cf68

diff --git a/Makefile b/Makefile
index cf8c1d1ee..162e353c7 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
 
-VERSION = 121
+VERSION = 123
 
 # set this to make use of syslog
 USE_LOG = true
@@ -258,9 +258,7 @@ install-bin:
 	$(INSTALL) -d $(DESTDIR)$(sbindir)
 	$(INSTALL_PROGRAM) udevd $(DESTDIR)$(sbindir)/udevd
 	$(INSTALL_PROGRAM) udevadm $(DESTDIR)$(sbindir)/udevadm
-	ln -f -s udevadm $(DESTDIR)$(sbindir)/udevtrigger
 	ln -f -s udevadm $(DESTDIR)$(sbindir)/udevsettle
-	ln -f -s udevadm $(DESTDIR)$(sbindir)/udevcontrol
 	$(INSTALL) -d $(DESTDIR)$(usrbindir)
 	ln -f -s $(sbindir)/udevadm $(DESTDIR)$(usrbindir)/udevinfo
 	@extras="$(EXTRAS)"; for target in $$extras; do \
@@ -268,7 +266,7 @@ install-bin:
 	done;
 ifndef DESTDIR
 	- killall udevd
-	- rm -rf /dev/.udev
+	- rm -rf $(udevdir)/.udev
 	- $(sbindir)/udevd --daemon
 endif
 .PHONY: install-bin
@@ -276,13 +274,11 @@ endif
 uninstall-bin:
 	- rm -f $(DESTDIR)$(sbindir)/udevd
 	- rm -f $(DESTDIR)$(sbindir)/udevadm
-	- rm -f $(DESTDIR)$(sbindir)/udevtrigger
 	- rm -f $(DESTDIR)$(sbindir)/udevsettle
-	- rm -f $(DESTDIR)$(sbindir)/udevcontrol
 	- rm -f $(DESTDIR)$(usrbindir)/udevinfo
 ifndef DESTDIR
 	- killall udevd
-	- rm -rf /dev/.udev
+	- rm -rf $(udevdir)/.udev
 endif
 	@extras="$(EXTRAS)"; for target in $$extras; do \
 		$(MAKE) -C $$target $@ || exit 1; \