Fix mapi code generator for out-of-tree build
authorJon TURNEY <jon.turney@dronecode.org.uk>
Mon, 14 Jan 2013 15:35:05 +0000 (15:35 +0000)
committerJon TURNEY <jon.turney@dronecode.org.uk>
Wed, 16 Jan 2013 19:53:01 +0000 (19:53 +0000)
Use os.path.join() rather than hand-rolling it, so path is correct if
sys.argv[0] returns an absolute path.

(According to the python documentation, it's platform dependent whether
sys.argv[0] is a full pathname or not.  It probably also depends on how
the process was started...)

Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
src/mapi/mapi/mapi_abi.py

index 30ffe7bc27a07ca1c9021a9a05d2c9b590f684b5..c645c02f919be0236b30319f8f5cc5e915affd90 100644 (file)
@@ -29,7 +29,7 @@
 import sys
 # make it possible to import glapi
 import os
-GLAPI = "./%s/../glapi/gen" % (os.path.dirname(sys.argv[0]))
+GLAPI = os.path.join(".", os.path.dirname(sys.argv[0]), "../glapi/gen")
 sys.path.append(GLAPI)
 
 import re