volume_id: enable GFS probing code, add LABEL support

[elogind.git] / Makefile

diff --git a/Makefile b/Makefile
index a560ef32acd62e44aaf2c8444db2c7f48a674f8e..e4392ca09a96a0c46b7c034f194e6ae360eeeb5c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
 
-VERSION = 119
+VERSION = 122
 
 # 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; \