diff options
| author | Koushik Dutta <koushd@gmail.com> | 2013-08-14 10:01:22 -0700 |
|---|---|---|
| committer | Koushik Dutta <koushd@gmail.com> | 2013-08-14 10:01:22 -0700 |
| commit | 49a02b8c916e8ef011d9f56901d208eca626b85b (patch) | |
| tree | 1148a42ede0e6661854b8f92d4bbe52a4290d02b /heimdall/Makefile.am | |
| parent | c82df274ecea32cd6528f070a21528bf80a2f466 (diff) | |
| parent | f95619028fa5c80284e6ade2ced7772e41040424 (diff) | |
| download | external_heimdall-49a02b8c916e8ef011d9f56901d208eca626b85b.zip external_heimdall-49a02b8c916e8ef011d9f56901d208eca626b85b.tar.gz external_heimdall-49a02b8c916e8ef011d9f56901d208eca626b85b.tar.bz2 | |
Merge remote-tracking branch 'bd/master' into cm-10.2
Conflicts:
Linux/README
OSX/README.txt
heimdall-frontend/doc-pak/README
heimdall/doc-pak/README
Change-Id: Ib5867d7a2be030290a3896ab82fe48a7f0a97e63
Diffstat (limited to 'heimdall/Makefile.am')
| -rw-r--r-- | heimdall/Makefile.am | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/heimdall/Makefile.am b/heimdall/Makefile.am index dcebb73..398a705 100644 --- a/heimdall/Makefile.am +++ b/heimdall/Makefile.am @@ -9,7 +9,6 @@ heimdall_SOURCES = source/Arguments.cpp \ source/ClosePcScreenAction.cpp \ source/DetectAction.cpp \ source/DownloadPitAction.cpp \ - source/DumpAction.cpp \ source/FlashAction.cpp \ source/HelpAction.cpp \ source/InfoAction.cpp \ @@ -24,14 +23,14 @@ heimdall_LDADD = $(DEPS_LIBS) $(STATIC_LIBS) if LINUXTARGET udevrulesdir = /lib/udev/rules.d -udevrules_DATA = 60-heimdall-galaxy-s.rules +udevrules_DATA = 60-heimdall.rules install-data-hook: @echo "" @echo "IMPORTANT - You must reboot your machine or execute the following as root:" if UDEVADM - @echo "udevadm control --reload_rules" + @echo "udevadm control --reload-rules" else @echo "service udev restart" endif |