--- trunk/udev/Makefile	2010/08/19 14:15:36	1094
+++ trunk/udev/Makefile	2010/10/21 20:06:18	1188
@@ -33,11 +33,7 @@
 	# install our pnpaliases; now excluded from 50-udev.rules
 	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-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
+	# 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
@@ -49,25 +45,33 @@
 	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-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-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-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-fstab_import.rules.magellan $(DESTDIR)${rulesdir}/80-fstab_import.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-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 -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: create-dirs install-files
+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-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-basic-files: create-dirs install-files
+install: install-basic-files install-extra-rules
 
-.PHONY: all install
+.PHONY: all install install-basic-files