summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2004-01-05 15:41:45 (UTC)
committer mickeyl <mickeyl>2004-01-05 15:41:45 (UTC)
commit22e51ed82162ef307f3f8cef21d3288147f18cad (patch) (side-by-side diff)
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
@@ -13,24 +13,25 @@ else
echo CONFIG -= debug >> $@
echo CONFIG += release >> $@
endif
ifeq ($(filter 3.%,$(QTE_VERSION)),) # not qt3
echo CONFIG -= qt3 >> $@
else
echo CONFIG += qt3 >> $@
endif
ifneq ($(CONFIG_QUICK_LAUNCH),)
echo contains\( CONFIG, quick-app \) \{ >> $@
echo CONFIG -= quick-app >> $@
echo CONFIG += quick-app-lib >> $@
+ echo QUICKLAUNCH_PATH = $(CONFIG_QUICKLAUNCH_PATH) >> $@
echo \} >> $@
else
echo contains\( CONFIG, quick-app \) \{ >> $@
echo CONFIG -= quick-app >> $@
echo CONFIG += quick-app-bin >> $@
echo \} >> $@
endif
ifeq ($(CONFIG_OPIE_NO_OVERRIDE_QT),y)
echo CONFIG += no-override >> $@
endif
ifeq ($(CONFIG_OPIE_NO_BUILTIN_SHUTDOWN),y)
echo DEFINES += OPIE_NO_BUILTIN_SHUTDOWN >> $@
diff --git a/config.in b/config.in
index 166332a..e93eac8 100644
--- a/config.in
+++ b/config.in
@@ -39,24 +39,28 @@ config OPTIMIZE
config DEBUG
boolean "Enable debug builds"
default n
config RELEASE
bool
default y
depends !DEBUG
config QUICK_LAUNCH
boolean "Enable Quick Launch"
default n
+config QUICKLAUNCH_PATH
+ string "Path to quicklauncher"
+ default "./quicklauncher" if TARGET_X86
+ default "/opt/QtPalmtop/bin/quicklauncher" if ! TARGET_X86
config SPECFILE
string
default "qws/linux-generic-g++" if TARGET_X86 && (! X11)
default "linux-g++" if TARGET_X86 && X11
default "qws/linux-sharp-g++" if TARGET_SHARP && (! X11)
default "linux-g++" if TARGET_SHARP && X11
default "qws/linux-ipaq-g++" if TARGET_IPAQ && (! X11)
default "linux-g++" if TARGET_IPAQ && X11
default "qws/linux-ramses-g++" if TARGET_RAMSES && (! X11)
default "linux-g++" if TARGET_RAMSES && X11
default "qws/linux-simpad-g++" if TARGET_SIMPAD && (! X11)