summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2004-09-29 16:03:54 +0000
committerMichael Lauer <mickey@vanille-media.de>2004-09-29 16:03:54 +0000
commite7accf1d04937aafeda19cf5575398465a7ccd5c (patch)
tree86a71fd37ec01c58e77d1a67e66daa151484a836 /conf
parent69d94698c98150c9cc32ee8a14bc29b8ea3766c9 (diff)
Merge bk://openembedded@openembedded.bkbits.net/packages
into gandalf.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages 2004/09/29 18:03:23+02:00 uni-frankfurt.de!mickeyl konqueror and libqpe-opie: catch up with qt staging changes 2004/09/29 18:02:28+02:00 uni-frankfurt.de!mickeyl first bits for the qt2/qt3 split. Notes: a) qte2 is default, so no changes should be necessary for packages using the qmake or qmake-derived oeclasses. b) overriding QTDIR is no longer supported, remove that from your .oe files. c) manual changes for non-qmake packages can be necessary. d) inherit qt3x11 to configure qmake for Qt3/X11 (sic) 2004/09/29 17:58:32+02:00 uni-frankfurt.de!mickeyl fix section for mikmod and modplugplay 2004/09/29 17:12:08+02:00 uni-frankfurt.de!mickeyl enable losetup in default busybox config BKrev: 415adcea4UMfz2lvSSK4JcNs17Q9sQ
Diffstat (limited to 'conf')
-rw-r--r--conf/oe.conf4
1 files changed, 2 insertions, 2 deletions
diff --git a/conf/oe.conf b/conf/oe.conf
index e1455ae364..c6820c94b3 100644
--- a/conf/oe.conf
+++ b/conf/oe.conf
@@ -195,8 +195,8 @@ CROSS_DATADIR = "${CROSS_DIR}/share"
# Add staging and cross to the PATH
export PATH_prepend = "${STAGING_BINDIR}:${CROSS_DIR}/bin:"
-# palmtop things - opie, qtopia
-export QTDIR = "${STAGING_DIR}/${HOST_SYS}"
+# palmtop things - per default for opie, qtopia
+export QTDIR = "${STAGING_DIR}/${HOST_SYS}/qt2"
export QPEDIR = "${STAGING_DIR}/${HOST_SYS}"
export OPIEDIR = "${STAGING_DIR}/${HOST_SYS}"
export palmtopdir = "/opt/QtPalmtop"