From 5d34c2e7c70de039c75c7a39933b98d14a659176 Mon Sep 17 00:00:00 2001
From: Nikias Bassen
Date: Tue, 19 May 2009 14:00:28 +0200
Subject: modified udev rules file to reflect autoconf prefix specification

---
 configure.ac             |  1 +
 udev/85-usbmuxd.rules    | 37 -------------------------------------
 udev/85-usbmuxd.rules.in | 37 +++++++++++++++++++++++++++++++++++++
 3 files changed, 38 insertions(+), 37 deletions(-)
 delete mode 100644 udev/85-usbmuxd.rules
 create mode 100644 udev/85-usbmuxd.rules.in

diff --git a/configure.ac b/configure.ac
index 03d207f..55ce7af 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,6 +24,7 @@ AC_OUTPUT([
 Makefile
 src/Makefile
 tools/Makefile
+udev/85-usbmuxd.rules
 udev/Makefile
 libusbmuxd.pc
 ])
diff --git a/udev/85-usbmuxd.rules b/udev/85-usbmuxd.rules
deleted file mode 100644
index 69ddef8..0000000
--- a/udev/85-usbmuxd.rules
+++ /dev/null
@@ -1,37 +0,0 @@
-# usbmuxd (iPhone "Apple Mobile Device" MUXer listening on /var/run/usbmuxd)
-#if
-#SUBSYSTEMS=="usb_interface", SYMLINK+="usbmux/interface"
-
-#SUBSYSTEMS!="usb", GOTO="usbmuxd_rules_end"  # stops the whole script working
-ATTR{idVendor}!="05ac", GOTO="usbmuxd_rules_end"
-
-# If it's plug insertion, flip it into dual "PTP + Apple Mobile Device" configuration
-# This allows another application to switch it later without it getting switched back (hopefully)
-# TODO: check iPod Touch/3G
-SUBSYSTEM=="usb", ACTION=="add", ATTR{product}=="iPhone", ATTR{bConfigurationValue}!="3", ATTR{bConfigurationValue}="3", GOTO="usbmuxd_rules_end"
-
-# SYMLINK the usbmux endpoints, if we get them
-# TODO: Multiple devices
-# TODO: work out how to make nice, incrementing  usbmux/{0,1,2,3}-in for 
-LABEL="usbmuxd_rules_usbmux"
-
-# ff/fe/02 == usbmux
-#
-#ACTION=="add", 
-
-# Try to symlink the interface, containing the endpoints.
-# ...But it doesn't work
-#KERNELS=="7-3:3.1", SUBSYSTEMS=="usb", ATTRS{bInterfaceNumber}=="01", ATTRS{bAlternateSetting}==" 0", ATTRS{bNumEndpoints}=="02", ATTRS{bInterfaceClass}=="ff", ATTRS{bInterfaceSubClass}=="fe", ATTRS{bInterfaceProtocol}=="02", SYMLINK+="usbmux/prettyplease", RUN+="/bin/ls -l /dev/usbmux/prettyplease"
-
-#ATTRS{bInterfaceClass}=="ff", ATTRS{bInterfaceSubClass}=="fe", ATTRS{bInterfaceProtocol}=="02", SYMLINK+="usbmux/interface"
-
-# Cute names, really they should have nice numerically increasing names.
-ACTION=="add", SUBSYSTEM=="usb_endpoint", KERNEL=="usbdev*_ep04", SYMLINK+="usbmux/in"
-ACTION=="add", SUBSYSTEM=="usb_endpoint", KERNEL=="usbdev*_ep85", SYMLINK+="usbmux/out"
-
-# Start and stop 'usbmuxd' as required.
-ACTION=="add", SUBSYSTEM=="usb_endpoint", KERNEL=="usbdev*_ep85", RUN+="/sbin/start-stop-daemon --start --oknodo --exec /usr/local/sbin/usbmuxd"
-ACTION=="remove", SUBSYSTEM=="usb_endpoint", KERNEL=="usbdev*_ep85", RUN+="/sbin/start-stop-daemon --stop --signal 2 --exec /usr/local/sbin/usbmuxd"
-
-# skip
-LABEL="usbmuxd_rules_end"
diff --git a/udev/85-usbmuxd.rules.in b/udev/85-usbmuxd.rules.in
new file mode 100644
index 0000000..e661ccd
--- /dev/null
+++ b/udev/85-usbmuxd.rules.in
@@ -0,0 +1,37 @@
+# usbmuxd (iPhone "Apple Mobile Device" MUXer listening on /var/run/usbmuxd)
+#if
+#SUBSYSTEMS=="usb_interface", SYMLINK+="usbmux/interface"
+
+#SUBSYSTEMS!="usb", GOTO="usbmuxd_rules_end"  # stops the whole script working
+ATTR{idVendor}!="05ac", GOTO="usbmuxd_rules_end"
+
+# If it's plug insertion, flip it into dual "PTP + Apple Mobile Device" configuration
+# This allows another application to switch it later without it getting switched back (hopefully)
+# TODO: check iPod Touch/3G
+SUBSYSTEM=="usb", ACTION=="add", ATTR{product}=="iPhone", ATTR{bConfigurationValue}!="3", ATTR{bConfigurationValue}="3", GOTO="usbmuxd_rules_end"
+
+# SYMLINK the usbmux endpoints, if we get them
+# TODO: Multiple devices
+# TODO: work out how to make nice, incrementing  usbmux/{0,1,2,3}-in for 
+LABEL="usbmuxd_rules_usbmux"
+
+# ff/fe/02 == usbmux
+#
+#ACTION=="add", 
+
+# Try to symlink the interface, containing the endpoints.
+# ...But it doesn't work
+#KERNELS=="7-3:3.1", SUBSYSTEMS=="usb", ATTRS{bInterfaceNumber}=="01", ATTRS{bAlternateSetting}==" 0", ATTRS{bNumEndpoints}=="02", ATTRS{bInterfaceClass}=="ff", ATTRS{bInterfaceSubClass}=="fe", ATTRS{bInterfaceProtocol}=="02", SYMLINK+="usbmux/prettyplease", RUN+="/bin/ls -l /dev/usbmux/prettyplease"
+
+#ATTRS{bInterfaceClass}=="ff", ATTRS{bInterfaceSubClass}=="fe", ATTRS{bInterfaceProtocol}=="02", SYMLINK+="usbmux/interface"
+
+# Cute names, really they should have nice numerically increasing names.
+ACTION=="add", SUBSYSTEM=="usb_endpoint", KERNEL=="usbdev*_ep04", SYMLINK+="usbmux/in"
+ACTION=="add", SUBSYSTEM=="usb_endpoint", KERNEL=="usbdev*_ep85", SYMLINK+="usbmux/out"
+
+# Start and stop 'usbmuxd' as required.
+ACTION=="add", SUBSYSTEM=="usb_endpoint", KERNEL=="usbdev*_ep85", RUN+="/sbin/start-stop-daemon --start --oknodo --exec @prefix@/sbin/usbmuxd"
+ACTION=="remove", SUBSYSTEM=="usb_endpoint", KERNEL=="usbdev*_ep85", RUN+="/sbin/start-stop-daemon --stop --signal 2 --exec @prefix@/sbin/usbmuxd"
+
+# skip
+LABEL="usbmuxd_rules_end"
-- 
cgit v1.1-32-gdbae