From 3d6a35972b70f9295455755802849303eb900a65 Mon Sep 17 00:00:00 2001
From: Benjamin Dobell <benjamin.dobell+git@glassechidna.com.au>
Date: Tue, 4 Jun 2013 22:49:48 +1000
Subject: Renamed udev rules file and explictly added /usr/include to the
 include search path for Heimdall Frontend on UNIX systems.

---
 heimdall-frontend/heimdall-frontend.pro | 1 +
 heimdall/60-heimdall-galaxy-s.rules     | 3 ---
 heimdall/60-heimdall.rules              | 3 +++
 heimdall/Makefile.am                    | 4 ++--
 heimdall/Makefile.in                    | 4 ++--
 5 files changed, 8 insertions(+), 7 deletions(-)
 delete mode 100644 heimdall/60-heimdall-galaxy-s.rules
 create mode 100644 heimdall/60-heimdall.rules

diff --git a/heimdall-frontend/heimdall-frontend.pro b/heimdall-frontend/heimdall-frontend.pro
index ffd45ea..ecc6235 100644
--- a/heimdall-frontend/heimdall-frontend.pro
+++ b/heimdall-frontend/heimdall-frontend.pro
@@ -95,6 +95,7 @@ INCLUDEPATH += ./GeneratedFiles \
     ./GeneratedFiles/Release \
     ../libpit/Source \
     .
+unix:INCLUDEPATH += /usr/include
 DEPENDPATH += .
 MOC_DIR += ./GeneratedFiles/release
 OBJECTS_DIR += release
diff --git a/heimdall/60-heimdall-galaxy-s.rules b/heimdall/60-heimdall-galaxy-s.rules
deleted file mode 100644
index 6c6259e..0000000
--- a/heimdall/60-heimdall-galaxy-s.rules
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", ATTR{idProduct}=="6601", MODE="0666"
-SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", ATTR{idProduct}=="685d", MODE="0666"
-SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", ATTR{idProduct}=="68c3", MODE="0666"
diff --git a/heimdall/60-heimdall.rules b/heimdall/60-heimdall.rules
new file mode 100644
index 0000000..6c6259e
--- /dev/null
+++ b/heimdall/60-heimdall.rules
@@ -0,0 +1,3 @@
+SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", ATTR{idProduct}=="6601", MODE="0666"
+SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", ATTR{idProduct}=="685d", MODE="0666"
+SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", ATTR{idProduct}=="68c3", MODE="0666"
diff --git a/heimdall/Makefile.am b/heimdall/Makefile.am
index f1a659f..6ed343c 100644
--- a/heimdall/Makefile.am
+++ b/heimdall/Makefile.am
@@ -22,8 +22,8 @@ heimdall_LDADD = $(DEPS_LIBS) $(STATIC_LIBS)
 
 if LINUXTARGET
 
-udevrulesdir = /lib/udev/rules.d
-udevrules_DATA = 60-heimdall-galaxy-s.rules
+udevrulesdir = ${libdir}/udev/rules.d
+udevrules_DATA = 60-heimdall.rules
 
 install-data-hook:
 	@echo ""
diff --git a/heimdall/Makefile.in b/heimdall/Makefile.in
index f16c740..0fc9021 100644
--- a/heimdall/Makefile.in
+++ b/heimdall/Makefile.in
@@ -302,8 +302,8 @@ heimdall_SOURCES = source/Arguments.cpp \
 	source/VersionAction.cpp
 
 heimdall_LDADD = $(DEPS_LIBS) $(STATIC_LIBS)
-@LINUXTARGET_TRUE@udevrulesdir = /lib/udev/rules.d
-@LINUXTARGET_TRUE@udevrules_DATA = 60-heimdall-galaxy-s.rules
+@LINUXTARGET_TRUE@udevrulesdir = ${libdir}/udev/rules.d
+@LINUXTARGET_TRUE@udevrules_DATA = 60-heimdall.rules
 dist_noinst_SCRIPTS = autogen.sh
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-am
-- 
cgit v1.1