diff options
| author | Benjamin Dobell <benjamin.dobell+git@glassechidna.com.au> | 2013-06-04 22:49:48 +1000 |
|---|---|---|
| committer | Benjamin Dobell <benjamin.dobell+git@glassechidna.com.au> | 2013-06-04 23:00:55 +1000 |
| commit | 3d6a35972b70f9295455755802849303eb900a65 (patch) | |
| tree | a5eb61d14fb8f2344c0ceace2987263bb1442630 | |
| parent | 858a3470e926fe3fbc605a136c2adb3b7012d1e2 (diff) | |
| download | external_heimdall-3d6a35972b70f9295455755802849303eb900a65.zip external_heimdall-3d6a35972b70f9295455755802849303eb900a65.tar.gz external_heimdall-3d6a35972b70f9295455755802849303eb900a65.tar.bz2 | |
Renamed udev rules file and explictly added /usr/include to the include search path for Heimdall Frontend on UNIX systems.
| -rw-r--r-- | heimdall-frontend/heimdall-frontend.pro | 1 | ||||
| -rw-r--r-- | heimdall/60-heimdall.rules (renamed from heimdall/60-heimdall-galaxy-s.rules) | 0 | ||||
| -rw-r--r-- | heimdall/Makefile.am | 4 | ||||
| -rw-r--r-- | heimdall/Makefile.in | 4 |
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 |