*** configure.py.BAK	Thu Mar 10 11:32:57 2005
--- PyKDE-snapshot20050305/configure.py	Thu Mar 10 11:36:44 2005
***************
*** 62,67 ****
--- 62,68 ----
  kde_sip_flags = []
  
  # Command line options.
+ opt_pykdebindir   = sipcfg.default_bin_dir
  opt_pykdemoddir   = sipcfg.default_mod_dir
  opt_pykdesipdir   = sipcfg.default_sip_dir
  opt_debug         = 0
***************
*** 183,191 ****
      rcode is the return code passed back to the calling process.
      """
      print "Usage:"
!     print "    python configure.py [-h] [-c] [-d dir] [-g] [-j #] [-k] [-n dir] [-o dir] [-r] [-u] [-v dir] [-z file]"
      print "where:"
      print "    -h      displays this help message"
      print "    -c      concatenates each module's C/C++ source files [default]"
      print "    -d dir  where the PyKDE modules will be installed [default %s]" % opt_pykdemoddir
      print "    -g      always release the GIL (SIP v3.x behaviour)"
--- 184,193 ----
      rcode is the return code passed back to the calling process.
      """
      print "Usage:"
!     print "    python configure.py [-h] [-b dir ] [-c] [-d dir] [-g] [-j #] [-k] [-n dir] [-o dir] [-r] [-u] [-v dir] [-z file]"
      print "where:"
      print "    -h      displays this help message"
+     print "    -b dir  where kdepyuic will be installed [default %s]" % opt_pykdebindir
      print "    -c      concatenates each module's C/C++ source files [default]"
      print "    -d dir  where the PyKDE modules will be installed [default %s]" % opt_pykdemoddir
      print "    -g      always release the GIL (SIP v3.x behaviour)"
***************
*** 258,264 ****
          "kde_version_str":      kde_version_str,
          "kde_version_sfx":      kde_version_sfx,
          "kde_version_extra":    kde_version_extra,
! #        "pykde_bin_dir":        opt_pykdebindir,
          "pykde_mod_dir":        opt_pykdemoddir,
          "pykde_sip_dir":        opt_pykdesipdir,
          "pykde_modules":        pykde_modules,
--- 260,266 ----
          "kde_version_str":      kde_version_str,
          "kde_version_sfx":      kde_version_sfx,
          "kde_version_extra":    kde_version_extra,
!         "pykde_bin_dir":        opt_pykdebindir,
          "pykde_mod_dir":        opt_pykdemoddir,
          "pykde_sip_dir":        opt_pykdesipdir,
          "pykde_modules":        pykde_modules,
***************
*** 708,714 ****
      sipconfig.ParentMakefile(
          configuration = sipcfg,
          subdirs = subdirs,
!         installs= [("pykdeconfig.py", opt_pykdemoddir), ("contrib/kdepyuic", sipcfg.default_bin_dir)]
      ).generate()
  
  def fileOpts (fn):
--- 710,716 ----
      sipconfig.ParentMakefile(
          configuration = sipcfg,
          subdirs = subdirs,
!         installs= [("pykdeconfig.py", opt_pykdemoddir), ("contrib/kdepyuic", opt_pykdebindir)]
      ).generate()
  
  def fileOpts (fn):
***************
*** 740,750 ****
      argv is the list of command line arguments.
      """
      try:
!         optlist, args = getopt.getopt(argv[1:], "hcd:gij:k:L:l:n:o:ruv:wz:")
      except getopt.GetoptError:
          usage()
  
!     global opt_pykdemoddir, opt_pykdesipdir
      global opt_debug, opt_concat, opt_releasegil
      global opt_split, opt_tracing, opt_startModName
      global opt_startmod, opt_endmod
--- 742,752 ----
      argv is the list of command line arguments.
      """
      try:
!         optlist, args = getopt.getopt(argv[1:], "hb:cd:gij:k:L:l:n:o:ruv:wz:")
      except getopt.GetoptError:
          usage()
  
!     global opt_pykdebindir, opt_pykdemoddir, opt_pykdesipdir
      global opt_debug, opt_concat, opt_releasegil
      global opt_split, opt_tracing, opt_startModName
      global opt_startmod, opt_endmod
***************
*** 767,772 ****
--- 769,776 ----
              usage(0)
  
          # turns on concatentation (on by default, here for consistency)
+         elif opt == "-b":
+             opt_pykdebindir = arg
          elif opt == "-c":
              opt_concat = 1