[PyKDE] Patch for PyKDE build.py

[Ricardo Javier Cardenes Medina]

Comes attached.
-------------- next part --------------
--- build.py	2002-08-21 19:08:38.000000000 +0100
+++ build.py.new	2002-08-23 10:30:12.000000000 +0100
@@ -48,6 +48,7 @@
 sipBin          = None
 
 modDir          = None
+modQtDir        = None
 pyFullVers      = None
 makefileGen     = None
 makeBin         = None
@@ -95,7 +96,8 @@
 
     rcode is the return code passed back to the calling process.
     """
-    global progName, platBinDir, platMake, modDir, platQTDIRName, sipIncDir
+    global progName, platBinDir, platMake, modDir, modQtDir, platQTDIRName
+    global sipIncDir
 
     print "Usage:"
     print "    %s [-h] " % (progName)
@@ -106,6 +108,7 @@
     print "  options:\n"
     print "    -c             concatenate each module's C++ source files"
     print "    -d dir         where PyKDE will be installed [default %s]" % (modDir)
+    print "    -D dir         where PyQt will is installed [default %s]" % (modQtDir)
     print "    -e dir         the directory containing the SIP header files [default %s]" % (sipIncDir)
     print "    -g prog        the name of the Makefile generator"
     print "    -i dir         the directory containing the Qt header files [default %s%sinclude]" % (platQTDIRName,os.sep)
@@ -186,7 +189,7 @@
     """
     global platMake, platCopy, platPyScriptDir, platPyDLLDir, platPySiteDir
     global platPyIncDir, platPyLib, platQTDIRName, platBinDir, platMkdir
-    global modDir, pyFullVers, sipIncDir, platKDEDIRName
+    global modDir, modQtDir, pyFullVers, sipIncDir, platKDEDIRName
 
     pyFullVers = string.split(sys.version)[0]
 
@@ -212,6 +215,7 @@
         platBinDir = "/usr/local/bin"
 
     modDir = platPySiteDir
+    modQtDir = platPySiteDir
     sipIncDir = platPyIncDir
 
 
@@ -598,7 +602,7 @@
 
 
 def checkThreading ():
-        qtmodlib = modDir + '/libqtcmodule.so'
+        qtmodlib = modQtDir + '/libqtcmodule.so'
         os.system ('ldd ' + qtmodlib + ' > lddtmp')
         f = open ('lddtmp', 'r')
         buff = f.read ()
@@ -1270,7 +1274,7 @@
     initGlobals()
 
     try:
-        optlist, args = getopt.getopt(argv[1:],"hcd:e:g:i:k:l:m:p:q:s:t:u:v:z:")
+        optlist, args = getopt.getopt(argv[1:],"hcd:D:e:g:i:k:l:m:p:q:s:t:u:v:z:")
     except getopt.GetoptError:
         usage()
 
@@ -1293,6 +1297,12 @@
         elif opt == "-d":
             global modDir
             modDir = arg
+        elif opt == "-D":
+            global modQtDir
+            modQtDir = arg
+            # Asuming modDir = modQtDir if it hasn't been modified
+            if modDir == platPySiteDir:
+                modDir = arg
         elif opt == "-e":
             global sipIncDir
             sipIncDir = arg