Changeset c6ecc4

Timestamp:

01/26/12 15:13:22 (4 months ago)

Author:

Micke Prag <micke.prag@…>

Branches:

('master', 'deebf2045e7119c339412580f37a1e653f7d5715')('controller-upgrade', '00f95d22e12d96ef089e0902ef62ae8ce841dc6f')

Children:

4ccb9b3563133f2356f6f0bfbb328aa9d6a9db91

Parents:

de745731df7c5974271faccc00ab508c1565a86c

git-author:

Micke Prag <micke.prag@telldus.se>2012-01-26 15:13:22+01:00

git-committer:

Micke Prag <micke.prag@telldus.se>2012-01-26 15:13:22+01:00

Message:

Use @VAR@ syntax in the file, else cmake complaints

Location:

telldus-core/tdadmin

Files:

• 05-tellstick.rules (modified) (1 diff)
• CMakeLists.txt (modified) (1 diff)

telldus-core/tdadmin/05-tellstick.rules

@@ -1 @@
-ATTRS{idVendor}=="1781", SUBSYSTEM=="usb", ACTION=="add", MODE="664", GROUP="plugdev", ENV{ID_VENDOR_ID}="$attr{idVendor}", ENV{ID_MODEL_ID}="$attr{idProduct}", ENV{ID_SERIAL_SHORT}="$attr{serial}", RUN+="${CMAKE_INSTALL_PREFIX}/share/telldus-core/helpers/udev.sh"
-ENV{ID_VENDOR_ID}=="1781", SUBSYSTEM=="usb", ACTION=="remove", ENV{ID_VENDOR_ID}="$attr{idVendor}", ENV{ID_MODEL_ID}="$attr{idProduct}", ENV{ID_SERIAL_SHORT}="$attr{serial}", RUN+="${CMAKE_INSTALL_PREFIX}/share/telldus-core/helpers/udev.sh"
+ATTRS{idVendor}=="1781", SUBSYSTEM=="usb", ACTION=="add", MODE="664", GROUP="plugdev", ENV{ID_VENDOR_ID}="$attr{idVendor}", ENV{ID_MODEL_ID}="$attr{idProduct}", ENV{ID_SERIAL_SHORT}="$attr{serial}", RUN+="@CMAKE_INSTALL_PREFIX@/share/telldus-core/helpers/udev.sh"
+ENV{ID_VENDOR_ID}=="1781", SUBSYSTEM=="usb", ACTION=="remove", ENV{ID_VENDOR_ID}="$attr{idVendor}", ENV{ID_MODEL_ID}="$attr{idProduct}", ENV{ID_SERIAL_SHORT}="$attr{serial}", RUN+="@CMAKE_INSTALL_PREFIX@/share/telldus-core/helpers/udev.sh"
 

telldus-core/tdadmin/CMakeLists.txt

@@ -64 +64 @@
                 ${CMAKE_CURRENT_SOURCE_DIR}/05-tellstick.rules
                 ${CMAKE_BINARY_DIR}/parsed/05-tellstick.rules
+                @ONLY
         )
         CONFIGURE_FILE(