release 125

[elogind.git] / Makefile

diff --git a/Makefile b/Makefile
index baa3df9b8f7f2a101abb8929223d91f27db780e1..8b391a01fc5b3fa79d5e088403bc08ca11e0157d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
 
-VERSION = 120
+VERSION = 125
 
 # set this to make use of syslog
 USE_LOG = true
@@ -190,9 +190,7 @@ udev_version.h:
        $(E) "  GENHDR  " $@
        $(Q) echo "/* Generated by make. */" > $@
        $(Q) echo \#define UDEV_VERSION         \"$(VERSION)\" >> $@
-       $(Q) echo \#define UDEV_ROOT            \"$(udevdir)\" >> $@
        $(Q) echo \#define UDEV_CONFIG_FILE     \"$(configdir)/udev.conf\" >> $@
-       $(Q) echo \#define UDEV_RULES_DIR       \"$(configdir)/rules.d\" >> $@
 
 # man pages
 %.8 %.7: %.xml
@@ -220,15 +218,12 @@ clean:
 .PHONY: clean
 
 install-config:
+       $(INSTALL) -d $(DESTDIR)$(libudevdir)/rules.d
        $(INSTALL) -d $(DESTDIR)$(configdir)/rules.d
        @ if [ ! -r $(DESTDIR)$(configdir)/udev.conf ]; then \
-               $(INSTALL_DATA) etc/udev/udev.conf $(DESTDIR)$(configdir); \
+               $(INSTALL_DATA) udev.conf $(DESTDIR)$(configdir); \
        fi
-       @ for i in etc/udev/rules.d/*.rules; do \
-               if [ ! -r $(DESTDIR)$(configdir)/rules.d/$$(basename $$i) ]; then \
-                       $(INSTALL_DATA) $$i $(DESTDIR)$(configdir)/rules.d; \
-               fi \
-       done
+       cp rules/rules.d/* $(DESTDIR)$(libudevdir)/rules.d
        @ extras="$(EXTRAS)"; for target in $$extras; do \
                $(MAKE) -C $$target $@ || exit 1; \
        done;
@@ -258,9 +253,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 +261,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 +269,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; \