summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2004-01-05 15:41:45 (UTC)
committer mickeyl <mickeyl>2004-01-05 15:41:45 (UTC)
commit22e51ed82162ef307f3f8cef21d3288147f18cad (patch) (unidiff)
treed3318a78deb837c91aca6d048ad649716060a5a3
parent969831e80dd285e8c95e8a91333a626717d5543e (diff)
downloadopie-22e51ed82162ef307f3f8cef21d3288147f18cad.zip
opie-22e51ed82162ef307f3f8cef21d3288147f18cad.tar.gz
opie-22e51ed82162ef307f3f8cef21d3288147f18cad.tar.bz2
support a customizable quicklaunch path, this fixes the problem when
people install quicklaunch applications to non-root hence having the link pointing to non-existing ./quicklauncher
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Rules.make1
-rw-r--r--config.in4
2 files changed, 5 insertions, 0 deletions
diff --git a/Rules.make b/Rules.make
index 82c71e1..31a1b66 100644
--- a/Rules.make
+++ b/Rules.make
@@ -19,12 +19,13 @@ else
19 echo CONFIG += qt3 >> $@ 19 echo CONFIG += qt3 >> $@
20endif 20endif
21ifneq ($(CONFIG_QUICK_LAUNCH),) 21ifneq ($(CONFIG_QUICK_LAUNCH),)
22 echo contains\( CONFIG, quick-app \) \{ >> $@ 22 echo contains\( CONFIG, quick-app \) \{ >> $@
23 echo CONFIG -= quick-app >> $@ 23 echo CONFIG -= quick-app >> $@
24 echo CONFIG += quick-app-lib >> $@ 24 echo CONFIG += quick-app-lib >> $@
25 echo QUICKLAUNCH_PATH = $(CONFIG_QUICKLAUNCH_PATH) >> $@
25 echo \} >> $@ 26 echo \} >> $@
26else 27else
27 echo contains\( CONFIG, quick-app \) \{ >> $@ 28 echo contains\( CONFIG, quick-app \) \{ >> $@
28 echo CONFIG -= quick-app >> $@ 29 echo CONFIG -= quick-app >> $@
29 echo CONFIG += quick-app-bin >> $@ 30 echo CONFIG += quick-app-bin >> $@
30 echo \} >> $@ 31 echo \} >> $@
diff --git a/config.in b/config.in
index 166332a..e93eac8 100644
--- a/config.in
+++ b/config.in
@@ -45,12 +45,16 @@ config RELEASE
45 depends !DEBUG 45 depends !DEBUG
46 46
47config QUICK_LAUNCH 47config QUICK_LAUNCH
48 boolean "Enable Quick Launch" 48 boolean "Enable Quick Launch"
49 default n 49 default n
50 50
51config QUICKLAUNCH_PATH
52 string "Path to quicklauncher"
53 default "./quicklauncher" if TARGET_X86
54 default "/opt/QtPalmtop/bin/quicklauncher" if ! TARGET_X86
51 55
52config SPECFILE 56config SPECFILE
53 string 57 string
54 default "qws/linux-generic-g++" if TARGET_X86 && (! X11) 58 default "qws/linux-generic-g++" if TARGET_X86 && (! X11)
55 default "linux-g++" if TARGET_X86 && X11 59 default "linux-g++" if TARGET_X86 && X11
56 default "qws/linux-sharp-g++" if TARGET_SHARP && (! X11) 60 default "qws/linux-sharp-g++" if TARGET_SHARP && (! X11)