--- trunk/udev/Makefile	2008/12/22 21:21:52	719
+++ tags/udev-170-r1/Makefile	2011/05/26 22:47:41	1325
@@ -1,63 +1,78 @@
 # udev rules
-# $Header: /root/magellan-cvs/src/udev/Makefile,v 1.1 2008-12-22 21:21:52 niro Exp $
+# $Header: /root/magellan-cvs/src/udev/Makefile,v 1.10 2010-08-19 14:15:36 niro Exp $
 
 DESTDIR=
 
 sysconfdir=/etc
+rcscriptdir=${sysconfdir}/rc.d/init.d
 modprobedir=${sysconfdir}/modprobe.d
 udevconfdir=${sysconfdir}/udev
 udevdir=/lib/udev
-rulesdir=${udev_dir}/rules.d
+rulesdir=${udevdir}/rules.d
 
 all: install
 
 create-dirs:
-	install -d -m 0755 $(DESTDIR)$(sysconfdir)
-	install -d -m 0755 $(DESTDIR)$(modprobedir)
-	install -d -m 0755 $(DESTDIR)$(udevconfdir)
-	install -d -m 0755 $(DESTDIR)$(udevdir)
-	install -d -m 0755 $(DESTDIR)$(rulesdir)
+	install -d -m 0755 $(DESTDIR)${sysconfdir}
+	install -d -m 0755 $(DESTDIR)${rcscriptdir}
+	install -d -m 0755 $(DESTDIR)${modprobedir}
+	install -d -m 0755 $(DESTDIR)${udevconfdir}
+	install -d -m 0755 $(DESTDIR)${udevdir}
+	install -d -m 0755 $(DESTDIR)${rulesdir}
 
 install-files:
+	# install rc-script
+	install -m 0755 udev.rc $(DESTDIR)${rcscriptdir}/udev
+
 	# our config file
-	install -m 0644 udev.conf $(DESTDIR)$(udevconfdir)/
+	install -m 0644 udev.conf $(DESTDIR)${udevconfdir}/
 
 	# install our blacklist
-	install -m 0644 blacklist $(DESTDIR)$(udevconfdir)/blacklist
+	install -m 0644 blacklist $(DESTDIR)${udevconfdir}/blacklist
 
 	# install our pnpaliases; now excluded from 50-udev.rules
-	install -m 0644 pnp-aliases $(DESTDIR)$(modprobedir)/pnp-aliases
+	install -m 0644 pnp-aliases $(DESTDIR)${modprobedir}/pnp-aliases.conf
 
-	# our rules
-	install -m 0644 udev-kernel-compat.rules.magellan $(DESTDIR)$(rulesdir)/30-kernel-compat.rules
-	install -m 0644 udev-alsa.rules.magellan $(DESTDIR)$(rulesdir)/40-alsa.rules
-	install -m 0644 udev-arch-ia64.rules.magellan $(DESTDIR)$(rulesdir)/40-arch-ia64.rules
-	install -m 0644 udev-arch-ppc.rules.magellan $(DESTDIR)$(rulesdir)/40-arch-ppc.rules
-	install -m 0644 udev-arch-s390.rules.magellan $(DESTDIR)$(rulesdir)/40-arch-s390.rules
-	install -m 0644 udev-infiniband.rules.magellan $(DESTDIR)$(rulesdir)/40-infiniband.rules
-	install -m 0644 udev-isdn.rules.magellan $(DESTDIR)$(rulesdir)/40-isdn.rules
-	install -m 0644 udev-magellan.rules.magellan $(DESTDIR)$(rulesdir)/40-magellan.rules
-	install -m 0644 udev-pilot-links.rules.magellan $(DESTDIR)$(rulesdir)/40-pilot-links.rules
-	install -m 0644 udev-zaptel.rules.magellan $(DESTDIR)$(rulesdir)/40-zaptel.rules
-	install -m 0644 udev.rules.magellan $(DESTDIR)$(rulesdir)/50-udev-default.rules
-	install -m 0644 udev-cdrom_id.rules.magellan $(DESTDIR)$(rulesdir)/60-cdrom_id.rules
-	install -m 0644 udev-persistent-input.rules.magellan $(DESTDIR)$(rulesdir)/60-persistent-input.rules
-	install -m 0644 udev-persistent-storage.rules.magellan $(DESTDIR)$(rulesdir)/60-persistent-storage.rules
-	install -m 0644 udev-persistent-storage-tape.rules.magellan $(DESTDIR)$(rulesdir)/60-persistent-storage-tape.rules
-	install -m 0644 udev-persistent-storage-edd.rules.magellan $(DESTDIR)$(rulesdir)/61-persistent-storage-edd.rules
-	install -m 0644 udev-persistent-v4l.rules.magellan $(DESTDIR)$(rulesdir)/60-persistent-v4l.rules
-	install -m 0644 udev-device-mapper.rules.magellan $(DESTDIR)$(rulesdir)/64-device-mapper.rules
-	install -m 0644 udev-md-raid.rules.magellan $(DESTDIR)$(rulesdir)/64-md-raid.rules
-	install -m 0644 udev-permissions.rules.magellan $(DESTDIR)$(rulesdir)/65-permissions.rules
-	install -m 0644 udev-cd-aliases-generator.rules.magellan $(DESTDIR)$(rulesdir)/75-cd-aliases-generator.rules
-	install -m 0644 udev-persistent-net-generator.rules.magellan $(DESTDIR)$(rulesdir)/75-persistent-net-generator.rules
-	install -m 0644 udev-drivers.rules.magellan $(DESTDIR)$(rulesdir)/80-drivers.rules
-	install -m 0644 udev-late.rules.magellan $(DESTDIR)$(rulesdir)/95-udev-late.rules
+	# basic rules
+	install -m 0644 udev.rules.magellan $(DESTDIR)${rulesdir}/50-udev-default.rules
+	install -m 0644 udev-firmware.rules.magellan $(DESTDIR)${rulesdir}/50-firmware.rules
+	install -m 0644 udev-cdrom_id.rules.magellan $(DESTDIR)${rulesdir}/60-cdrom_id.rules
+	install -m 0644 udev-floppy.rules.magellan $(DESTDIR)${rulesdir}/60-floppy.rules
+	install -m 0644 udev-persistent-alsa.rules.magellan $(DESTDIR)${rulesdir}/60-persistent-alsa.rules
+	install -m 0644 udev-persistent-input.rules.magellan $(DESTDIR)${rulesdir}/60-persistent-input.rules
+	install -m 0644 udev-persistent-serial.rules.magellan $(DESTDIR)${rulesdir}/60-persistent-serial.rules
+	install -m 0644 udev-persistent-storage.rules.magellan $(DESTDIR)${rulesdir}/60-persistent-storage.rules
+	install -m 0644 udev-persistent-storage-tape.rules.magellan $(DESTDIR)${rulesdir}/60-persistent-storage-tape.rules
+	install -m 0644 udev-persistent-storage-edd.rules.magellan $(DESTDIR)${rulesdir}/61-persistent-storage-edd.rules
+	install -m 0644 udev-persistent-v4l.rules.magellan $(DESTDIR)${rulesdir}/60-persistent-v4l.rules
+	install -m 0644 udev-probe-mtd.rules.magellan $(DESTDIR)${rulesdir}/75-probe-mtd.rules
+	install -m 0644 udev-cd-aliases-generator.rules.magellan $(DESTDIR)${rulesdir}/75-cd-aliases-generator.rules
+	install -m 0644 udev-persistent-net-generator.rules.magellan $(DESTDIR)${rulesdir}/75-persistent-net-generator.rules
+	install -m 0644 udev-fstab_import.rules.magellan $(DESTDIR)${rulesdir}/79-fstab_import.rules
+	install -m 0644 udev-drivers.rules.magellan $(DESTDIR)${rulesdir}/80-drivers.rules
+	install -m 0644 udev-late.rules.magellan $(DESTDIR)${rulesdir}/95-udev-late.rules
 
 	# generic udev helper scripts
-	install -m 0755 modprobe.sh $(DESTDIR)$(udevdir)/
-	install -m 0755 write_root_link_rule.sh $(DESTDIR)$(udevdir)/write_root_link_rule
+	install -m 0755 modprobe.sh $(DESTDIR)${udevdir}/
+	install -m 0755 write_root_link_rule.sh $(DESTDIR)${udevdir}/write_root_link_rule
+
+install-extra-rules:
+	install -m 0644 udev-kernel-compat.rules.magellan $(DESTDIR)${rulesdir}/30-kernel-compat.rules
+	install -m 0644 udev-arch-ia64.rules.magellan $(DESTDIR)${rulesdir}/40-arch-ia64.rules
+	install -m 0644 udev-arch-ppc.rules.magellan $(DESTDIR)${rulesdir}/40-arch-ppc.rules
+	install -m 0644 udev-arch-s390.rules.magellan $(DESTDIR)${rulesdir}/40-arch-s390.rules
+	install -m 0644 udev-qemu-usb.rules.magellan $(DESTDIR)${rulesdir}/42-qemu-usb.rules
+	install -m 0644 udev-mobile-action.rules.magellan $(DESTDIR)${rulesdir}/61-mobile-action.rules
+	install -m 0644 udev-acl.rules.magellan $(DESTDIR)${rulesdir}/70-acl.rules
+	install -m 0644 udev-hid2hci.rules.magellan $(DESTDIR)${rulesdir}/70-hid2hci.rules
+	install -m 0644 udev-probe-mtd.rules.magellan $(DESTDIR)${rulesdir}/75-probe-mtd.rules
+	install -m 0644 udev-net-description.rules.magellan $(DESTDIR)${rulesdir}/75-net-description.rules
+	install -m 0644 udev-tty-description.rules.magellan $(DESTDIR)${rulesdir}/75-tty-description.rules
+	install -m 0644 udev-sound-card.rules.magellan $(DESTDIR)${rulesdir}/78-sound-card.rules
+	install -m 0644 udev-keymap.rules.magellan $(DESTDIR)${rulesdir}/95-keymap.rules
+	install -m 0644 udev-keyboard-force-release.rules.magellan $(DESTDIR)${rulesdir}/95-keyboard-force-release.rules
 
-install: create-dirs install-files
+install-basic-files: create-dirs install-files
+install: install-basic-files install-extra-rules
 
-.PHONY: all install
+.PHONY: all install install-basic-files