Merge bk://oe-devel.bkbits.net/openembedded

into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/02/21 17:35:27-06:00 ti.com!kergoth
Kill the ipkg paths patch, since its busted.

2005/02/21 17:33:13-06:00 ti.com!kergoth
Fix sbindir in native.bbclass and cross.bbclass.  Thanks to Jordan Crouse for reporting.

2005/02/21 17:13:19-06:00 ti.com!kergoth
Add the paths patch to ipkg which fixes it to no longer hardcode the '/usr/lib/ipkg' path, which I forgot to check in from the previous commit.

2005/02/21 17:09:46-06:00 ti.com!kergoth
Merge oe-devel@oe-devel.bkbits.net:openembedded
into odin.sc.ti.com:/home/kergoth/code/user/oe/openembedded

2005/02/21 17:09:03-06:00 ti.com!kergoth
Run a sed script against our packages to fix some hardcoded target path
references.  As always when I do things like this, if packages you maintain
were touched by this, please do a sanity check to ensure the sed script didn't
run wild.

2005/02/21 15:49:47-06:00 ti.com!kergoth
Use a HOTPLUG variable to manage which hotplug you prefer, to ensure that hotplug is still included in task-bootstrap even if you dont set DISTRO.

BKrev: 421b2b63X5eoMcSrC7pVcptXK-iFKg

3 files changed, 81 insertions, 81 deletions

diff --git a/packages/python/python-2.3.4-manifest.inc b/packages/python/python-2.3.4-manifest.inc
index cec02ae024..e2344f2029 100644
--- a/packages/python/python-2.3.4-manifest.inc
+++ b/packages/python/python-2.3.4-manifest.inc
@@ -9,202 +9,202 @@ PACKAGES="python-codecs python-threading python-distutils python-textutils pytho
 DESCRIPTION_python-codecs="Python Codecs, Encodings & i18n Support"
 PR_python-codecs="ml2"
 RDEPENDS_python-codecs="python-core"
-FILES_python-codecs="/usr/lib/python2.3/codecs.* /usr/lib/python2.3/encodings /usr/lib/python2.3/locale.* /usr/lib/python2.3/lib-dynload/_locale.so /usr/lib/python2.3/lib-dynload/unicodedata.so /usr/lib/python2.3/gettext.* /usr/lib/python2.3/xdrlib.* "
+FILES_python-codecs="${libdir}/python2.3/codecs.* ${libdir}/python2.3/encodings ${libdir}/python2.3/locale.* ${libdir}/python2.3/lib-dynload/_locale.so ${libdir}/python2.3/lib-dynload/unicodedata.so ${libdir}/python2.3/gettext.* ${libdir}/python2.3/xdrlib.* "
 
 DESCRIPTION_python-threading="Python Threading & Synchronization Support"
 PR_python-threading="ml2"
 RDEPENDS_python-threading="python-core python-lang"
-FILES_python-threading="/usr/lib/python2.3/bisect.* /usr/lib/python2.3/threading.* /usr/lib/python2.3/Queue.* "
+FILES_python-threading="${libdir}/python2.3/bisect.* ${libdir}/python2.3/threading.* ${libdir}/python2.3/Queue.* "
 
 DESCRIPTION_python-distutils="Python Distribution Utility"
 PR_python-distutils="ml2"
 RDEPENDS_python-distutils="python-core"
-FILES_python-distutils="/usr/lib/python2.3/distutils "
+FILES_python-distutils="${libdir}/python2.3/distutils "
 
 DESCRIPTION_python-textutils="Python Option Parsing, Text Wrapping and Comma-Separated-Value Support"
 PR_python-textutils="ml2"
 RDEPENDS_python-textutils="python-core python-io python-re python-stringold"
-FILES_python-textutils="/usr/lib/python2.3/lib-dynload/_csv.so /usr/lib/python2.3/csv.* /usr/lib/python2.3/optparse.* /usr/lib/python2.3/textwrap.* "
+FILES_python-textutils="${libdir}/python2.3/lib-dynload/_csv.so ${libdir}/python2.3/csv.* ${libdir}/python2.3/optparse.* ${libdir}/python2.3/textwrap.* "
 
 DESCRIPTION_python-curses="Python Curses Support"
 PR_python-curses="ml2"
 RDEPENDS_python-curses="python-core libncurses5"
-FILES_python-curses="/usr/lib/python2.3/curses /usr/lib/python2.3/lib-dynload/_curses.so /usr/lib/python2.3/lib-dynload/_curses_panel.so "
+FILES_python-curses="${libdir}/python2.3/curses ${libdir}/python2.3/lib-dynload/_curses.so ${libdir}/python2.3/lib-dynload/_curses_panel.so "
 
 DESCRIPTION_python-pickle="Python Persistence Support"
 PR_python-pickle="ml2"
 RDEPENDS_python-pickle="python-core python-re"
-FILES_python-pickle="/usr/lib/python2.3/pickle.* /usr/lib/python2.3/shelve.* /usr/lib/python2.3/lib-dynload/cPickle.so "
+FILES_python-pickle="${libdir}/python2.3/pickle.* ${libdir}/python2.3/shelve.* ${libdir}/python2.3/lib-dynload/cPickle.so "
 
 DESCRIPTION_python-core="Python Interpreter and core modules (needed!)"
 PR_python-core="ml2"
 RDEPENDS_python-core=""
-FILES_python-core="/usr/lib/python2.3/__future__.* /usr/lib/python2.3/copy.* /usr/lib/python2.3/copy_reg.* /usr/lib/python2.3/ConfigParser.py /usr/lib/python2.3/getopt.* /usr/lib/python2.3/new.* /usr/lib/python2.3/os.* /usr/lib/python2.3/posixpath.* /usr/lib/python2.3/warnings.* /usr/lib/python2.3/site.* /usr/lib/python2.3/stat.* /usr/lib/python2.3/UserDict.* /usr/lib/python2.3/lib-dynload/binascii.so /usr/lib/python2.3/lib-dynload/struct.so /usr/lib/python2.3/lib-dynload/time.so /usr/lib/python2.3/lib-dynload/xreadlines.so /usr/lib/python2.3/types.* /usr/bin/python "
+FILES_python-core="${libdir}/python2.3/__future__.* ${libdir}/python2.3/copy.* ${libdir}/python2.3/copy_reg.* ${libdir}/python2.3/ConfigParser.py ${libdir}/python2.3/getopt.* ${libdir}/python2.3/new.* ${libdir}/python2.3/os.* ${libdir}/python2.3/posixpath.* ${libdir}/python2.3/warnings.* ${libdir}/python2.3/site.* ${libdir}/python2.3/stat.* ${libdir}/python2.3/UserDict.* ${libdir}/python2.3/lib-dynload/binascii.so ${libdir}/python2.3/lib-dynload/struct.so ${libdir}/python2.3/lib-dynload/time.so ${libdir}/python2.3/lib-dynload/xreadlines.so ${libdir}/python2.3/types.* ${bindir}/python "
 
 DESCRIPTION_python-io="Python Low-Level I/O"
 PR_python-io="ml2"
 RDEPENDS_python-io="python-core python-math"
-FILES_python-io="/usr/lib/python2.3/lib-dynload/_socket.so /usr/lib/python2.3/lib-dynload/select.so /usr/lib/python2.3/lib-dynload/termios.so /usr/lib/python2.3/lib-dynload/cStringIO.so /usr/lib/python2.3/pipes.* /usr/lib/python2.3/socket.* /usr/lib/python2.3/tempfile.* /usr/lib/python2.3/StringIO.* "
+FILES_python-io="${libdir}/python2.3/lib-dynload/_socket.so ${libdir}/python2.3/lib-dynload/select.so ${libdir}/python2.3/lib-dynload/termios.so ${libdir}/python2.3/lib-dynload/cStringIO.so ${libdir}/python2.3/pipes.* ${libdir}/python2.3/socket.* ${libdir}/python2.3/tempfile.* ${libdir}/python2.3/StringIO.* "
 
 DESCRIPTION_python-compression="Python High Level Compression Support"
 PR_python-compression="ml2"
 RDEPENDS_python-compression="python-core python-zlib"
-FILES_python-compression="/usr/lib/python2.3/gzip.* /usr/lib/python2.3/zipfile.* "
+FILES_python-compression="${libdir}/python2.3/gzip.* ${libdir}/python2.3/zipfile.* "
 
 DESCRIPTION_python-re="Python Regular Expression APIs"
 PR_python-re="ml2"
 RDEPENDS_python-re="python-core python-stringold"
-FILES_python-re="/usr/lib/python2.3/re.* /usr/lib/python2.3/sre.* /usr/lib/python2.3/sre_compile.* /usr/lib/python2.3/sre_constants* /usr/lib/python2.3/sre_parse.* "
+FILES_python-re="${libdir}/python2.3/re.* ${libdir}/python2.3/sre.* ${libdir}/python2.3/sre_compile.* ${libdir}/python2.3/sre_constants* ${libdir}/python2.3/sre_parse.* "
 
 DESCRIPTION_python-xmlrpc="Python XMLRPC Support"
 PR_python-xmlrpc="ml2"
 RDEPENDS_python-xmlrpc="python-core python-xml python-netserver python-lang"
-FILES_python-xmlrpc="/usr/lib/python2.3/xmlrpclib.* /usr/lib/python2.3/SimpleXMLRPCServer.* "
+FILES_python-xmlrpc="${libdir}/python2.3/xmlrpclib.* ${libdir}/python2.3/SimpleXMLRPCServer.* "
 
 DESCRIPTION_python-terminal="Python Terminal Controlling Support"
 PR_python-terminal="ml2"
 RDEPENDS_python-terminal="python-core python-io"
-FILES_python-terminal="/usr/lib/python2.3/pty.* /usr/lib/python2.3/tty.* "
+FILES_python-terminal="${libdir}/python2.3/pty.* ${libdir}/python2.3/tty.* "
 
 DESCRIPTION_python-email="Python Email Support"
 PR_python-email="ml2"
 RDEPENDS_python-email="python-core python-io python-re"
-FILES_python-email="/usr/lib/python2.3/email "
+FILES_python-email="${libdir}/python2.3/email "
 
 DESCRIPTION_python-image="Python Graphical Image Handling"
 PR_python-image="ml2"
 RDEPENDS_python-image="python-core"
-FILES_python-image="/usr/lib/python2.3/colorsys.* /usr/lib/python2.3/imghdr.* /usr/lib/python2.3/lib-dynload/imageop.so /usr/lib/python2.3/lib-dynload/rgbimg.so "
+FILES_python-image="${libdir}/python2.3/colorsys.* ${libdir}/python2.3/imghdr.* ${libdir}/python2.3/lib-dynload/imageop.so ${libdir}/python2.3/lib-dynload/rgbimg.so "
 
 DESCRIPTION_python-resource="Python Resource Control Interface"
 PR_python-resource="ml2"
 RDEPENDS_python-resource="python-core"
-FILES_python-resource="/usr/lib/python2.3/lib-dynload/resource.so "
+FILES_python-resource="${libdir}/python2.3/lib-dynload/resource.so "
 
 DESCRIPTION_python-math="Python Math Support"
 PR_python-math="ml2"
 RDEPENDS_python-math="python-core"
-FILES_python-math="/usr/lib/python2.3/lib-dynload/cmath.so /usr/lib/python2.3/lib-dynload/math.so /usr/lib/python2.3/lib-dynload/_random.so /usr/lib/python2.3/random.* "
+FILES_python-math="${libdir}/python2.3/lib-dynload/cmath.so ${libdir}/python2.3/lib-dynload/math.so ${libdir}/python2.3/lib-dynload/_random.so ${libdir}/python2.3/random.* "
 
 DESCRIPTION_python-hotshot="Python Hotshot Profiler"
 PR_python-hotshot="ml2"
 RDEPENDS_python-hotshot="python-core"
-FILES_python-hotshot="/usr/lib/python2.3/hotshot /usr/lib/python2.3/lib-dynload/_hotshot.so "
+FILES_python-hotshot="${libdir}/python2.3/hotshot ${libdir}/python2.3/lib-dynload/_hotshot.so "
 
 DESCRIPTION_python-unixadmin="Python Unix Administration Support"
 PR_python-unixadmin="ml2"
 RDEPENDS_python-unixadmin="python-core"
-FILES_python-unixadmin="/usr/lib/python2.3/lib-dynload/nis.so /usr/lib/python2.3/lib-dynload/grp.so /usr/lib/python2.3/lib-dynload/pwd.so /usr/lib/python2.3/getpass.* "
+FILES_python-unixadmin="${libdir}/python2.3/lib-dynload/nis.so ${libdir}/python2.3/lib-dynload/grp.so ${libdir}/python2.3/lib-dynload/pwd.so ${libdir}/python2.3/getpass.* "
 
 DESCRIPTION_python-gdbm="Python GNU Database Support"
 PR_python-gdbm="ml2"
 RDEPENDS_python-gdbm="python-core libgdbm3"
-FILES_python-gdbm="/usr/lib/python2.3/lib-dynload/gdbm.so "
+FILES_python-gdbm="${libdir}/python2.3/lib-dynload/gdbm.so "
 
 DESCRIPTION_python-fcntl="Python's fcntl Interface"
 PR_python-fcntl="ml2"
 RDEPENDS_python-fcntl="python-core"
-FILES_python-fcntl="/usr/lib/python2.3/lib-dynload/fcntl.so "
+FILES_python-fcntl="${libdir}/python2.3/lib-dynload/fcntl.so "
 
 DESCRIPTION_python-netclient="Python Internet Protocol Clients"
 PR_python-netclient="ml2"
 RDEPENDS_python-netclient="python-core python-io python-mime"
-FILES_python-netclient="/usr/lib/python2.3/base64.* /usr/lib/python2.3/ftplib.* /usr/lib/python2.3/gopherlib.* /usr/lib/python2.3/hmac.* /usr/lib/python2.3/httplib.* /usr/lib/python2.3/mimetypes.* /usr/lib/python2.3/nntplib.* /usr/lib/python2.3/poplib.* /usr/lib/python2.3/smtplib.* /usr/lib/python2.3/telnetlib.* /usr/lib/python2.3/urllib.* /usr/lib/python2.3/urllib2.* /usr/lib/python2.3/urlparse.* "
+FILES_python-netclient="${libdir}/python2.3/base64.* ${libdir}/python2.3/ftplib.* ${libdir}/python2.3/gopherlib.* ${libdir}/python2.3/hmac.* ${libdir}/python2.3/httplib.* ${libdir}/python2.3/mimetypes.* ${libdir}/python2.3/nntplib.* ${libdir}/python2.3/poplib.* ${libdir}/python2.3/smtplib.* ${libdir}/python2.3/telnetlib.* ${libdir}/python2.3/urllib.* ${libdir}/python2.3/urllib2.* ${libdir}/python2.3/urlparse.* "
 
 DESCRIPTION_python-pprint="Python Pretty-Print Support"
 PR_python-pprint="ml2"
 RDEPENDS_python-pprint="python-core"
-FILES_python-pprint="/usr/lib/python2.3/pprint.* "
+FILES_python-pprint="${libdir}/python2.3/pprint.* "
 
 DESCRIPTION_python-netserver="Python Internet Protocol Servers"
 PR_python-netserver="ml2"
 RDEPENDS_python-netserver="python-core python-netclient"
-FILES_python-netserver="/usr/lib/python2.3/cgi.* /usr/lib/python2.3/BaseHTTPServer.* /usr/lib/python2.3/SimpleHTTPServer.* /usr/lib/python2.3/SocketServer.* "
+FILES_python-netserver="${libdir}/python2.3/cgi.* ${libdir}/python2.3/BaseHTTPServer.* ${libdir}/python2.3/SimpleHTTPServer.* ${libdir}/python2.3/SocketServer.* "
 
 DESCRIPTION_python-compiler="Python Compiler Support"
 PR_python-compiler="ml2"
 RDEPENDS_python-compiler="python-core"
-FILES_python-compiler="/usr/lib/python2.3/compiler "
+FILES_python-compiler="${libdir}/python2.3/compiler "
 
 DESCRIPTION_python-syslog="Python's syslog Interface"
 PR_python-syslog="ml2"
 RDEPENDS_python-syslog="python-core"
-FILES_python-syslog="/usr/lib/python2.3/lib-dynload/syslog.so "
+FILES_python-syslog="${libdir}/python2.3/lib-dynload/syslog.so "
 
 DESCRIPTION_python-html="Python HTML Processing"
 PR_python-html="ml2"
 RDEPENDS_python-html="python-core"
-FILES_python-html="/usr/lib/python2.3/formatter.* /usr/lib/python2.3/htmlentitydefs.* /usr/lib/python2.3/htmllib.* /usr/lib/python2.3/markupbase.* /usr/lib/python2.3/sgmllib.* "
+FILES_python-html="${libdir}/python2.3/formatter.* ${libdir}/python2.3/htmlentitydefs.* ${libdir}/python2.3/htmllib.* ${libdir}/python2.3/markupbase.* ${libdir}/python2.3/sgmllib.* "
 
 DESCRIPTION_python-readline="Python Readline Support"
 PR_python-readline="ml2"
 RDEPENDS_python-readline="python-core libreadline4"
-FILES_python-readline="/usr/lib/python2.3/lib-dynload/readline.so /usr/lib/python2.3/rlcompleter.* "
+FILES_python-readline="${libdir}/python2.3/lib-dynload/readline.so ${libdir}/python2.3/rlcompleter.* "
 
 DESCRIPTION_python-pydoc="Python Interactive Help Support"
 PR_python-pydoc="ml2"
 RDEPENDS_python-pydoc="python-core python-lang python-stringold python-re"
-FILES_python-pydoc="/usr/bin/pydoc /usr/lib/python2.3/pydoc.* "
+FILES_python-pydoc="${bindir}/pydoc ${libdir}/python2.3/pydoc.* "
 
 DESCRIPTION_python-xml="Python basic XML support."
 PR_python-xml="ml2"
 RDEPENDS_python-xml="python-core python-re"
-FILES_python-xml="/usr/lib/python2.3/lib-dynload/pyexpat.so /usr/lib/python2.3/xml /usr/lib/python2.3/xmllib.* "
+FILES_python-xml="${libdir}/python2.3/lib-dynload/pyexpat.so ${libdir}/python2.3/xml ${libdir}/python2.3/xmllib.* "
 
 DESCRIPTION_python-mime="Python MIME Handling APIs"
 PR_python-mime="ml2"
 RDEPENDS_python-mime="python-core python-io"
-FILES_python-mime="/usr/lib/python2.3/mimetools.* /usr/lib/python2.3/rfc822.* "
+FILES_python-mime="${libdir}/python2.3/mimetools.* ${libdir}/python2.3/rfc822.* "
 
 DESCRIPTION_python-unittest="Python Unit Testing Framework"
 PR_python-unittest="ml2"
 RDEPENDS_python-unittest="python-core python-stringold python-lang"
-FILES_python-unittest="/usr/lib/python2.3/unittest.* "
+FILES_python-unittest="${libdir}/python2.3/unittest.* "
 
 DESCRIPTION_python-stringold="Python Deprecated String APIs"
 PR_python-stringold="ml2"
 RDEPENDS_python-stringold="python-core"
-FILES_python-stringold="/usr/lib/python2.3/lib-dynload/strop.so /usr/lib/python2.3/string.* "
+FILES_python-stringold="${libdir}/python2.3/lib-dynload/strop.so ${libdir}/python2.3/string.* "
 
 DESCRIPTION_python-compile="Python Bytecode Compilation Support"
 PR_python-compile="ml2"
 RDEPENDS_python-compile="python-core"
-FILES_python-compile="/usr/lib/python2.3/py_compile.* /usr/lib/python2.3/compileall.* "
+FILES_python-compile="${libdir}/python2.3/py_compile.* ${libdir}/python2.3/compileall.* "
 
 DESCRIPTION_python-shell="Python Shell-Like Functionality"
 PR_python-shell="ml2"
 RDEPENDS_python-shell="python-core python-re"
-FILES_python-shell="/usr/lib/python2.3/commands.* /usr/lib/python2.3/dircache.* /usr/lib/python2.3/fnmatch.* /usr/lib/python2.3/glob.* /usr/lib/python2.3/popen2.* /usr/lib/python2.3/shutil.* "
+FILES_python-shell="${libdir}/python2.3/commands.* ${libdir}/python2.3/dircache.* ${libdir}/python2.3/fnmatch.* ${libdir}/python2.3/glob.* ${libdir}/python2.3/popen2.* ${libdir}/python2.3/shutil.* "
 
 DESCRIPTION_python-mmap="Python Memory-Mapped-File Support"
 PR_python-mmap="ml2"
 RDEPENDS_python-mmap="python-core python-io"
-FILES_python-mmap="/usr/lib/python2.3/lib-dynload/mmap.so "
+FILES_python-mmap="${libdir}/python2.3/lib-dynload/mmap.so "
 
 DESCRIPTION_python-zlib="Python zlib Support."
 PR_python-zlib="ml3"
 RDEPENDS_python-zlib="python-core libz1"
-FILES_python-zlib="/usr/lib/python2.3/lib-dynload/zlib.so "
+FILES_python-zlib="${libdir}/python2.3/lib-dynload/zlib.so "
 
 DESCRIPTION_python-db="Python File-Based Database Support"
 PR_python-db="ml2"
 RDEPENDS_python-db="python-core"
-FILES_python-db="/usr/lib/python2.3/anydbm.* /usr/lib/python2.3/dumbdbm.* /usr/lib/python2.3/whichdb.* "
+FILES_python-db="${libdir}/python2.3/anydbm.* ${libdir}/python2.3/dumbdbm.* ${libdir}/python2.3/whichdb.* "
 
 DESCRIPTION_python-crypt="Python Basic Cryptographic and Hashing Support"
 PR_python-crypt="ml2"
 RDEPENDS_python-crypt="python-core"
-FILES_python-crypt="/usr/lib/python2.3/lib-dynload/crypt.so /usr/lib/python2.3/lib-dynload/md5.so /usr/lib/python2.3/lib-dynload/rotor.so /usr/lib/python2.3/lib-dynload/sha.so "
+FILES_python-crypt="${libdir}/python2.3/lib-dynload/crypt.so ${libdir}/python2.3/lib-dynload/md5.so ${libdir}/python2.3/lib-dynload/rotor.so ${libdir}/python2.3/lib-dynload/sha.so "
 
 DESCRIPTION_python-lang="Python Low-Level Language Support"
 PR_python-lang="ml2"
 RDEPENDS_python-lang="python-core"
-FILES_python-lang="/usr/lib/python2.3/lib-dynload/array.so /usr/lib/python2.3/lib-dynload/parser.so /usr/lib/python2.3/lib-dynload/operator.so /usr/lib/python2.3/lib-dynload/_weakref.so /usr/lib/python2.3/atexit.* /usr/lib/python2.3/code.* /usr/lib/python2.3/codeop.* /usr/lib/python2.3/dis.* /usr/lib/python2.3/inspect.* /usr/lib/python2.3/keyword.* /usr/lib/python2.3/opcode.* /usr/lib/python2.3/repr.* /usr/lib/python2.3/token.* /usr/lib/python2.3/tokenize.* /usr/lib/python2.3/traceback.* /usr/lib/python2.3/linecache.* /usr/lib/python2.3/weakref.* "
+FILES_python-lang="${libdir}/python2.3/lib-dynload/array.so ${libdir}/python2.3/lib-dynload/parser.so ${libdir}/python2.3/lib-dynload/operator.so ${libdir}/python2.3/lib-dynload/_weakref.so ${libdir}/python2.3/atexit.* ${libdir}/python2.3/code.* ${libdir}/python2.3/codeop.* ${libdir}/python2.3/dis.* ${libdir}/python2.3/inspect.* ${libdir}/python2.3/keyword.* ${libdir}/python2.3/opcode.* ${libdir}/python2.3/repr.* ${libdir}/python2.3/token.* ${libdir}/python2.3/tokenize.* ${libdir}/python2.3/traceback.* ${libdir}/python2.3/linecache.* ${libdir}/python2.3/weakref.* "
 
 DESCRIPTION_python-audio="Python Audio Handling"
 PR_python-audio="ml2"
 RDEPENDS_python-audio="python-core"
-FILES_python-audio="/usr/lib/python2.3/wave.* /usr/lib/python2.3/chunk.* /usr/lib/python2.3/lib-dynload/ossaudiodev.so /usr/lib/python2.3/lib-dynload/audioop.so "
+FILES_python-audio="${libdir}/python2.3/wave.* ${libdir}/python2.3/chunk.* ${libdir}/python2.3/lib-dynload/ossaudiodev.so ${libdir}/python2.3/lib-dynload/audioop.so "
 
 
 
diff --git a/packages/python/python-2.4.0-manifest.inc b/packages/python/python-2.4.0-manifest.inc
index 3ede1edaac..6266632b83 100644
--- a/packages/python/python-2.4.0-manifest.inc
+++ b/packages/python/python-2.4.0-manifest.inc
@@ -9,202 +9,202 @@ PACKAGES="python-codecs python-threading python-distutils python-textutils pytho
 DESCRIPTION_python-codecs="Python Codecs, Encodings & i18n Support"
 PR_python-codecs="ml2"
 RDEPENDS_python-codecs="python-core"
-FILES_python-codecs="/usr/lib/python2.4/codecs.* /usr/lib/python2.4/encodings /usr/lib/python2.4/locale.* /usr/lib/python2.4/lib-dynload/_locale.so /usr/lib/python2.4/lib-dynload/unicodedata.so /usr/lib/python2.4/gettext.* /usr/lib/python2.4/xdrlib.* "
+FILES_python-codecs="${libdir}/python2.4/codecs.* ${libdir}/python2.4/encodings ${libdir}/python2.4/locale.* ${libdir}/python2.4/lib-dynload/_locale.so ${libdir}/python2.4/lib-dynload/unicodedata.so ${libdir}/python2.4/gettext.* ${libdir}/python2.4/xdrlib.* "
 
 DESCRIPTION_python-threading="Python Threading & Synchronization Support"
 PR_python-threading="ml2"
 RDEPENDS_python-threading="python-core python-lang"
-FILES_python-threading="/usr/lib/python2.4/bisect.* /usr/lib/python2.4/threading.* /usr/lib/python2.4/Queue.* "
+FILES_python-threading="${libdir}/python2.4/bisect.* ${libdir}/python2.4/threading.* ${libdir}/python2.4/Queue.* "
 
 DESCRIPTION_python-distutils="Python Distribution Utility"
 PR_python-distutils="ml2"
 RDEPENDS_python-distutils="python-core"
-FILES_python-distutils="/usr/lib/python2.4/distutils "
+FILES_python-distutils="${libdir}/python2.4/distutils "
 
 DESCRIPTION_python-textutils="Python Option Parsing, Text Wrapping and Comma-Separated-Value Support"
 PR_python-textutils="ml2"
 RDEPENDS_python-textutils="python-core python-io python-re python-stringold"
-FILES_python-textutils="/usr/lib/python2.4/lib-dynload/_csv.so /usr/lib/python2.4/csv.* /usr/lib/python2.4/optparse.* /usr/lib/python2.4/textwrap.* "
+FILES_python-textutils="${libdir}/python2.4/lib-dynload/_csv.so ${libdir}/python2.4/csv.* ${libdir}/python2.4/optparse.* ${libdir}/python2.4/textwrap.* "
 
 DESCRIPTION_python-curses="Python Curses Support"
 PR_python-curses="ml2"
 RDEPENDS_python-curses="python-core libncurses5"
-FILES_python-curses="/usr/lib/python2.4/curses /usr/lib/python2.4/lib-dynload/_curses.so /usr/lib/python2.4/lib-dynload/_curses_panel.so "
+FILES_python-curses="${libdir}/python2.4/curses ${libdir}/python2.4/lib-dynload/_curses.so ${libdir}/python2.4/lib-dynload/_curses_panel.so "
 
 DESCRIPTION_python-pickle="Python Persistence Support"
 PR_python-pickle="ml2"
 RDEPENDS_python-pickle="python-core python-re"
-FILES_python-pickle="/usr/lib/python2.4/pickle.* /usr/lib/python2.4/shelve.* /usr/lib/python2.4/lib-dynload/cPickle.so "
+FILES_python-pickle="${libdir}/python2.4/pickle.* ${libdir}/python2.4/shelve.* ${libdir}/python2.4/lib-dynload/cPickle.so "
 
 DESCRIPTION_python-core="Python Interpreter and core modules (needed!)"
 PR_python-core="ml2"
 RDEPENDS_python-core=""
-FILES_python-core="/usr/lib/python2.4/__future__.* /usr/lib/python2.4/copy.* /usr/lib/python2.4/copy_reg.* /usr/lib/python2.4/ConfigParser.py /usr/lib/python2.4/getopt.* /usr/lib/python2.4/new.* /usr/lib/python2.4/os.* /usr/lib/python2.4/posixpath.* /usr/lib/python2.4/warnings.* /usr/lib/python2.4/site.* /usr/lib/python2.4/stat.* /usr/lib/python2.4/UserDict.* /usr/lib/python2.4/lib-dynload/binascii.so /usr/lib/python2.4/lib-dynload/struct.so /usr/lib/python2.4/lib-dynload/time.so /usr/lib/python2.4/lib-dynload/xreadlines.so /usr/lib/python2.4/types.* /usr/bin/python "
+FILES_python-core="${libdir}/python2.4/__future__.* ${libdir}/python2.4/copy.* ${libdir}/python2.4/copy_reg.* ${libdir}/python2.4/ConfigParser.py ${libdir}/python2.4/getopt.* ${libdir}/python2.4/new.* ${libdir}/python2.4/os.* ${libdir}/python2.4/posixpath.* ${libdir}/python2.4/warnings.* ${libdir}/python2.4/site.* ${libdir}/python2.4/stat.* ${libdir}/python2.4/UserDict.* ${libdir}/python2.4/lib-dynload/binascii.so ${libdir}/python2.4/lib-dynload/struct.so ${libdir}/python2.4/lib-dynload/time.so ${libdir}/python2.4/lib-dynload/xreadlines.so ${libdir}/python2.4/types.* ${bindir}/python "
 
 DESCRIPTION_python-io="Python Low-Level I/O"
 PR_python-io="ml2"
 RDEPENDS_python-io="python-core python-math"
-FILES_python-io="/usr/lib/python2.4/lib-dynload/_socket.so /usr/lib/python2.4/lib-dynload/select.so /usr/lib/python2.4/lib-dynload/termios.so /usr/lib/python2.4/lib-dynload/cStringIO.so /usr/lib/python2.4/pipes.* /usr/lib/python2.4/socket.* /usr/lib/python2.4/tempfile.* /usr/lib/python2.4/StringIO.* "
+FILES_python-io="${libdir}/python2.4/lib-dynload/_socket.so ${libdir}/python2.4/lib-dynload/select.so ${libdir}/python2.4/lib-dynload/termios.so ${libdir}/python2.4/lib-dynload/cStringIO.so ${libdir}/python2.4/pipes.* ${libdir}/python2.4/socket.* ${libdir}/python2.4/tempfile.* ${libdir}/python2.4/StringIO.* "
 
 DESCRIPTION_python-compression="Python High Level Compression Support"
 PR_python-compression="ml2"
 RDEPENDS_python-compression="python-core python-zlib"
-FILES_python-compression="/usr/lib/python2.4/gzip.* /usr/lib/python2.4/zipfile.* "
+FILES_python-compression="${libdir}/python2.4/gzip.* ${libdir}/python2.4/zipfile.* "
 
 DESCRIPTION_python-re="Python Regular Expression APIs"
 PR_python-re="ml2"
 RDEPENDS_python-re="python-core python-stringold"
-FILES_python-re="/usr/lib/python2.4/re.* /usr/lib/python2.4/sre.* /usr/lib/python2.4/sre_compile.* /usr/lib/python2.4/sre_constants* /usr/lib/python2.4/sre_parse.* "
+FILES_python-re="${libdir}/python2.4/re.* ${libdir}/python2.4/sre.* ${libdir}/python2.4/sre_compile.* ${libdir}/python2.4/sre_constants* ${libdir}/python2.4/sre_parse.* "
 
 DESCRIPTION_python-xmlrpc="Python XMLRPC Support"
 PR_python-xmlrpc="ml2"
 RDEPENDS_python-xmlrpc="python-core python-xml python-netserver python-lang"
-FILES_python-xmlrpc="/usr/lib/python2.4/xmlrpclib.* /usr/lib/python2.4/SimpleXMLRPCServer.* "
+FILES_python-xmlrpc="${libdir}/python2.4/xmlrpclib.* ${libdir}/python2.4/SimpleXMLRPCServer.* "
 
 DESCRIPTION_python-terminal="Python Terminal Controlling Support"
 PR_python-terminal="ml2"
 RDEPENDS_python-terminal="python-core python-io"
-FILES_python-terminal="/usr/lib/python2.4/pty.* /usr/lib/python2.4/tty.* "
+FILES_python-terminal="${libdir}/python2.4/pty.* ${libdir}/python2.4/tty.* "
 
 DESCRIPTION_python-email="Python Email Support"
 PR_python-email="ml2"
 RDEPENDS_python-email="python-core python-io python-re"
-FILES_python-email="/usr/lib/python2.4/email "
+FILES_python-email="${libdir}/python2.4/email "
 
 DESCRIPTION_python-image="Python Graphical Image Handling"
 PR_python-image="ml2"
 RDEPENDS_python-image="python-core"
-FILES_python-image="/usr/lib/python2.4/colorsys.* /usr/lib/python2.4/imghdr.* /usr/lib/python2.4/lib-dynload/imageop.so /usr/lib/python2.4/lib-dynload/rgbimg.so "
+FILES_python-image="${libdir}/python2.4/colorsys.* ${libdir}/python2.4/imghdr.* ${libdir}/python2.4/lib-dynload/imageop.so ${libdir}/python2.4/lib-dynload/rgbimg.so "
 
 DESCRIPTION_python-resource="Python Resource Control Interface"
 PR_python-resource="ml2"
 RDEPENDS_python-resource="python-core"
-FILES_python-resource="/usr/lib/python2.4/lib-dynload/resource.so "
+FILES_python-resource="${libdir}/python2.4/lib-dynload/resource.so "
 
 DESCRIPTION_python-math="Python Math Support"
 PR_python-math="ml2"
 RDEPENDS_python-math="python-core"
-FILES_python-math="/usr/lib/python2.4/lib-dynload/cmath.so /usr/lib/python2.4/lib-dynload/math.so /usr/lib/python2.4/lib-dynload/_random.so /usr/lib/python2.4/random.* "
+FILES_python-math="${libdir}/python2.4/lib-dynload/cmath.so ${libdir}/python2.4/lib-dynload/math.so ${libdir}/python2.4/lib-dynload/_random.so ${libdir}/python2.4/random.* "
 
 DESCRIPTION_python-hotshot="Python Hotshot Profiler"
 PR_python-hotshot="ml2"
 RDEPENDS_python-hotshot="python-core"
-FILES_python-hotshot="/usr/lib/python2.4/hotshot /usr/lib/python2.4/lib-dynload/_hotshot.so "
+FILES_python-hotshot="${libdir}/python2.4/hotshot ${libdir}/python2.4/lib-dynload/_hotshot.so "
 
 DESCRIPTION_python-unixadmin="Python Unix Administration Support"
 PR_python-unixadmin="ml2"
 RDEPENDS_python-unixadmin="python-core"
-FILES_python-unixadmin="/usr/lib/python2.4/lib-dynload/nis.so /usr/lib/python2.4/lib-dynload/grp.so /usr/lib/python2.4/lib-dynload/pwd.so /usr/lib/python2.4/getpass.* "
+FILES_python-unixadmin="${libdir}/python2.4/lib-dynload/nis.so ${libdir}/python2.4/lib-dynload/grp.so ${libdir}/python2.4/lib-dynload/pwd.so ${libdir}/python2.4/getpass.* "
 
 DESCRIPTION_python-gdbm="Python GNU Database Support"
 PR_python-gdbm="ml2"
 RDEPENDS_python-gdbm="python-core libgdbm3"
-FILES_python-gdbm="/usr/lib/python2.4/lib-dynload/gdbm.so "
+FILES_python-gdbm="${libdir}/python2.4/lib-dynload/gdbm.so "
 
 DESCRIPTION_python-fcntl="Python's fcntl Interface"
 PR_python-fcntl="ml2"
 RDEPENDS_python-fcntl="python-core"
-FILES_python-fcntl="/usr/lib/python2.4/lib-dynload/fcntl.so "
+FILES_python-fcntl="${libdir}/python2.4/lib-dynload/fcntl.so "
 
 DESCRIPTION_python-netclient="Python Internet Protocol Clients"
 PR_python-netclient="ml2"
 RDEPENDS_python-netclient="python-core python-io python-mime"
-FILES_python-netclient="/usr/lib/python2.4/base64.* /usr/lib/python2.4/ftplib.* /usr/lib/python2.4/gopherlib.* /usr/lib/python2.4/hmac.* /usr/lib/python2.4/httplib.* /usr/lib/python2.4/mimetypes.* /usr/lib/python2.4/nntplib.* /usr/lib/python2.4/poplib.* /usr/lib/python2.4/smtplib.* /usr/lib/python2.4/telnetlib.* /usr/lib/python2.4/urllib.* /usr/lib/python2.4/urllib2.* /usr/lib/python2.4/urlparse.* "
+FILES_python-netclient="${libdir}/python2.4/base64.* ${libdir}/python2.4/ftplib.* ${libdir}/python2.4/gopherlib.* ${libdir}/python2.4/hmac.* ${libdir}/python2.4/httplib.* ${libdir}/python2.4/mimetypes.* ${libdir}/python2.4/nntplib.* ${libdir}/python2.4/poplib.* ${libdir}/python2.4/smtplib.* ${libdir}/python2.4/telnetlib.* ${libdir}/python2.4/urllib.* ${libdir}/python2.4/urllib2.* ${libdir}/python2.4/urlparse.* "
 
 DESCRIPTION_python-pprint="Python Pretty-Print Support"
 PR_python-pprint="ml2"
 RDEPENDS_python-pprint="python-core"
-FILES_python-pprint="/usr/lib/python2.4/pprint.* "
+FILES_python-pprint="${libdir}/python2.4/pprint.* "
 
 DESCRIPTION_python-netserver="Python Internet Protocol Servers"
 PR_python-netserver="ml2"
 RDEPENDS_python-netserver="python-core python-netclient"
-FILES_python-netserver="/usr/lib/python2.4/cgi.* /usr/lib/python2.4/BaseHTTPServer.* /usr/lib/python2.4/SimpleHTTPServer.* /usr/lib/python2.4/SocketServer.* "
+FILES_python-netserver="${libdir}/python2.4/cgi.* ${libdir}/python2.4/BaseHTTPServer.* ${libdir}/python2.4/SimpleHTTPServer.* ${libdir}/python2.4/SocketServer.* "
 
 DESCRIPTION_python-compiler="Python Compiler Support"
 PR_python-compiler="ml2"
 RDEPENDS_python-compiler="python-core"
-FILES_python-compiler="/usr/lib/python2.4/compiler "
+FILES_python-compiler="${libdir}/python2.4/compiler "
 
 DESCRIPTION_python-syslog="Python's syslog Interface"
 PR_python-syslog="ml2"
 RDEPENDS_python-syslog="python-core"
-FILES_python-syslog="/usr/lib/python2.4/lib-dynload/syslog.so "
+FILES_python-syslog="${libdir}/python2.4/lib-dynload/syslog.so "
 
 DESCRIPTION_python-html="Python HTML Processing"
 PR_python-html="ml2"
 RDEPENDS_python-html="python-core"
-FILES_python-html="/usr/lib/python2.4/formatter.* /usr/lib/python2.4/htmlentitydefs.* /usr/lib/python2.4/htmllib.* /usr/lib/python2.4/markupbase.* /usr/lib/python2.4/sgmllib.* "
+FILES_python-html="${libdir}/python2.4/formatter.* ${libdir}/python2.4/htmlentitydefs.* ${libdir}/python2.4/htmllib.* ${libdir}/python2.4/markupbase.* ${libdir}/python2.4/sgmllib.* "
 
 DESCRIPTION_python-readline="Python Readline Support"
 PR_python-readline="ml2"
 RDEPENDS_python-readline="python-core libreadline4"
-FILES_python-readline="/usr/lib/python2.4/lib-dynload/readline.so /usr/lib/python2.4/rlcompleter.* "
+FILES_python-readline="${libdir}/python2.4/lib-dynload/readline.so ${libdir}/python2.4/rlcompleter.* "
 
 DESCRIPTION_python-pydoc="Python Interactive Help Support"
 PR_python-pydoc="ml2"
 RDEPENDS_python-pydoc="python-core python-lang python-stringold python-re"
-FILES_python-pydoc="/usr/bin/pydoc /usr/lib/python2.4/pydoc.* "
+FILES_python-pydoc="${bindir}/pydoc ${libdir}/python2.4/pydoc.* "
 
 DESCRIPTION_python-xml="Python basic XML support."
 PR_python-xml="ml2"
 RDEPENDS_python-xml="python-core python-re"
-FILES_python-xml="/usr/lib/python2.4/lib-dynload/pyexpat.so /usr/lib/python2.4/xml /usr/lib/python2.4/xmllib.* "
+FILES_python-xml="${libdir}/python2.4/lib-dynload/pyexpat.so ${libdir}/python2.4/xml ${libdir}/python2.4/xmllib.* "
 
 DESCRIPTION_python-mime="Python MIME Handling APIs"
 PR_python-mime="ml2"
 RDEPENDS_python-mime="python-core python-io"
-FILES_python-mime="/usr/lib/python2.4/mimetools.* /usr/lib/python2.4/rfc822.* "
+FILES_python-mime="${libdir}/python2.4/mimetools.* ${libdir}/python2.4/rfc822.* "
 
 DESCRIPTION_python-unittest="Python Unit Testing Framework"
 PR_python-unittest="ml2"
 RDEPENDS_python-unittest="python-core python-stringold python-lang"
-FILES_python-unittest="/usr/lib/python2.4/unittest.* "
+FILES_python-unittest="${libdir}/python2.4/unittest.* "
 
 DESCRIPTION_python-stringold="Python Deprecated String APIs"
 PR_python-stringold="ml2"
 RDEPENDS_python-stringold="python-core"
-FILES_python-stringold="/usr/lib/python2.4/lib-dynload/strop.so /usr/lib/python2.4/string.* "
+FILES_python-stringold="${libdir}/python2.4/lib-dynload/strop.so ${libdir}/python2.4/string.* "
 
 DESCRIPTION_python-compile="Python Bytecode Compilation Support"
 PR_python-compile="ml2"
 RDEPENDS_python-compile="python-core"
-FILES_python-compile="/usr/lib/python2.4/py_compile.* /usr/lib/python2.4/compileall.* "
+FILES_python-compile="${libdir}/python2.4/py_compile.* ${libdir}/python2.4/compileall.* "
 
 DESCRIPTION_python-shell="Python Shell-Like Functionality"
 PR_python-shell="ml2"
 RDEPENDS_python-shell="python-core python-re"
-FILES_python-shell="/usr/lib/python2.4/commands.* /usr/lib/python2.4/dircache.* /usr/lib/python2.4/fnmatch.* /usr/lib/python2.4/glob.* /usr/lib/python2.4/popen2.* /usr/lib/python2.4/shutil.* "
+FILES_python-shell="${libdir}/python2.4/commands.* ${libdir}/python2.4/dircache.* ${libdir}/python2.4/fnmatch.* ${libdir}/python2.4/glob.* ${libdir}/python2.4/popen2.* ${libdir}/python2.4/shutil.* "
 
 DESCRIPTION_python-mmap="Python Memory-Mapped-File Support"
 PR_python-mmap="ml2"
 RDEPENDS_python-mmap="python-core python-io"
-FILES_python-mmap="/usr/lib/python2.4/lib-dynload/mmap.so "
+FILES_python-mmap="${libdir}/python2.4/lib-dynload/mmap.so "
 
 DESCRIPTION_python-zlib="Python zlib Support."
 PR_python-zlib="ml3"
 RDEPENDS_python-zlib="python-core libz1"
-FILES_python-zlib="/usr/lib/python2.4/lib-dynload/zlib.so "
+FILES_python-zlib="${libdir}/python2.4/lib-dynload/zlib.so "
 
 DESCRIPTION_python-db="Python File-Based Database Support"
 PR_python-db="ml2"
 RDEPENDS_python-db="python-core"
-FILES_python-db="/usr/lib/python2.4/anydbm.* /usr/lib/python2.4/dumbdbm.* /usr/lib/python2.4/whichdb.* "
+FILES_python-db="${libdir}/python2.4/anydbm.* ${libdir}/python2.4/dumbdbm.* ${libdir}/python2.4/whichdb.* "
 
 DESCRIPTION_python-crypt="Python Basic Cryptographic and Hashing Support"
 PR_python-crypt="ml2"
 RDEPENDS_python-crypt="python-core"
-FILES_python-crypt="/usr/lib/python2.4/lib-dynload/crypt.so /usr/lib/python2.4/lib-dynload/md5.so /usr/lib/python2.4/lib-dynload/rotor.so /usr/lib/python2.4/lib-dynload/sha.so "
+FILES_python-crypt="${libdir}/python2.4/lib-dynload/crypt.so ${libdir}/python2.4/lib-dynload/md5.so ${libdir}/python2.4/lib-dynload/rotor.so ${libdir}/python2.4/lib-dynload/sha.so "
 
 DESCRIPTION_python-lang="Python Low-Level Language Support"
 PR_python-lang="ml2"
 RDEPENDS_python-lang="python-core"
-FILES_python-lang="/usr/lib/python2.4/lib-dynload/array.so /usr/lib/python2.4/lib-dynload/parser.so /usr/lib/python2.4/lib-dynload/operator.so /usr/lib/python2.4/lib-dynload/_weakref.so /usr/lib/python2.4/atexit.* /usr/lib/python2.4/code.* /usr/lib/python2.4/codeop.* /usr/lib/python2.4/dis.* /usr/lib/python2.4/inspect.* /usr/lib/python2.4/keyword.* /usr/lib/python2.4/opcode.* /usr/lib/python2.4/repr.* /usr/lib/python2.4/token.* /usr/lib/python2.4/tokenize.* /usr/lib/python2.4/traceback.* /usr/lib/python2.4/linecache.* /usr/lib/python2.4/weakref.* "
+FILES_python-lang="${libdir}/python2.4/lib-dynload/array.so ${libdir}/python2.4/lib-dynload/parser.so ${libdir}/python2.4/lib-dynload/operator.so ${libdir}/python2.4/lib-dynload/_weakref.so ${libdir}/python2.4/atexit.* ${libdir}/python2.4/code.* ${libdir}/python2.4/codeop.* ${libdir}/python2.4/dis.* ${libdir}/python2.4/inspect.* ${libdir}/python2.4/keyword.* ${libdir}/python2.4/opcode.* ${libdir}/python2.4/repr.* ${libdir}/python2.4/token.* ${libdir}/python2.4/tokenize.* ${libdir}/python2.4/traceback.* ${libdir}/python2.4/linecache.* ${libdir}/python2.4/weakref.* "
 
 DESCRIPTION_python-audio="Python Audio Handling"
 PR_python-audio="ml2"
 RDEPENDS_python-audio="python-core"
-FILES_python-audio="/usr/lib/python2.4/wave.* /usr/lib/python2.4/chunk.* /usr/lib/python2.4/lib-dynload/ossaudiodev.so /usr/lib/python2.4/lib-dynload/audioop.so "
+FILES_python-audio="${libdir}/python2.4/wave.* ${libdir}/python2.4/chunk.* ${libdir}/python2.4/lib-dynload/ossaudiodev.so ${libdir}/python2.4/lib-dynload/audioop.so "
 
 
 
diff --git a/packages/python/python-pyqwt_3.10.bb b/packages/python/python-pyqwt_3.10.bb
index 7b3c8ab28f..c39661bd28 100644
--- a/packages/python/python-pyqwt_3.10.bb
+++ b/packages/python/python-pyqwt_3.10.bb
@@ -61,4 +61,4 @@ do_install() {
     done
 }
 
-FILES_${PN} = "/usr/lib/${PYTHON_DIR}/site-packages"
+FILES_${PN} = "${libdir}/${PYTHON_DIR}/site-packages"