X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile;h=ed2b381d07234e1d35f5ed346f4fc2376e5d2c28;hb=282988c4f8a85c28468e6442e86efe51dc71cc93;hp=075389b6ead1c9aba809459ccd59460a11f75617;hpb=c986ca557ddd2c98807edbd727cda6a20b234642;p=elogind.git

diff --git a/Makefile b/Makefile
index 075389b6e..ed2b381d0 100644
--- a/Makefile
+++ b/Makefile
@@ -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;