summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Dobell <benjamin.dobell+git@glassechidna.com.au>2013-06-04 14:49:48 +0200
committerBenjamin Dobell <benjamin.dobell+git@glassechidna.com.au>2013-06-04 15:00:55 +0200
commit3d6a35972b70f9295455755802849303eb900a65 (patch)
treea5eb61d14fb8f2344c0ceace2987263bb1442630
parentMoved LICENSE to root of the repo and deleted heimdall-frontend duplicate documentation in doc-pak. (diff)
downloadHeimdall-3d6a35972b70f9295455755802849303eb900a65.tar
Heimdall-3d6a35972b70f9295455755802849303eb900a65.tar.gz
Heimdall-3d6a35972b70f9295455755802849303eb900a65.tar.bz2
Heimdall-3d6a35972b70f9295455755802849303eb900a65.tar.lz
Heimdall-3d6a35972b70f9295455755802849303eb900a65.tar.xz
Heimdall-3d6a35972b70f9295455755802849303eb900a65.tar.zst
Heimdall-3d6a35972b70f9295455755802849303eb900a65.zip
-rw-r--r--heimdall-frontend/heimdall-frontend.pro1
-rw-r--r--heimdall/60-heimdall.rules (renamed from heimdall/60-heimdall-galaxy-s.rules)0
-rw-r--r--heimdall/Makefile.am4
-rw-r--r--heimdall/Makefile.in4
4 files changed, 5 insertions, 4 deletions
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.rules
index 6c6259e..6c6259e 100644
--- a/heimdall/60-heimdall-galaxy-s.rules
+++ b/heimdall/60-heimdall.rules
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