casa-mp-base

Index: setup.py

===================================================================

--- setup.py.orig   2008-05-30 09:34:24.000000000 +0200

+++ setup.py    2008-10-11 00:44:38.000000000 +0200

@@ -79,7 +79,7 @@

-if len( sys.argv) > 1 and sys.argv[1] == 'install' and '--help' not in sys.argv:

+if len( sys.argv) > 1 and 'install' in sys.argv and '--help' not in sys.argv:

   data_dir = set.command_obj['install'].install_data

   py_dir = set.command_obj['install'].install_lib

   bin_dir = set.command_obj['install'].install_scripts

@@ -92,11 +92,11 @@

     print "ERROR: couldn't open the file %s for write" %  config_name

     sys.exit()

   file.write( "# the bkchem configuration file, do not edit!\n #(unless you are pretty sure that you know what you are doing, which even I am not)\n")

-  file.write( 'BKCHEM_MODULE_PATH="%s"\n' % strip_path( os.path.join( py_dir, "bkchem")))

-  file.write( 'BKCHEM_TEMPLATE_PATH="%s"\n' % strip_path( os.path.join( data_dir, "share/bkchem/templates")))

-  file.write( 'BKCHEM_PIXMAP_PATH="%s"\n' % strip_path( os.path.join( data_dir, "share/bkchem/pixmaps")))

-  file.write( 'BKCHEM_IMAGE_PATH="%s"\n' % strip_path( os.path.join( data_dir, "share/bkchem/images")))

-  file.write( 'BKCHEM_PLUGIN_PATH="%s"\n' % strip_path( os.path.join( data_dir, "share/bkchem/plugins")))

+  file.write( 'BKCHEM_MODULE_PATH="%s"\n' % strip_path( os.path.join( "__PREFIX__", "bin", "bkchem")))

+  file.write( 'BKCHEM_TEMPLATE_PATH="%s"\n' % strip_path( os.path.join( "__PREFIX__", "share/bkchem/templates")))

+  file.write( 'BKCHEM_PIXMAP_PATH="%s"\n' % strip_path( os.path.join( "__PREFIX__", "share/bkchem/pixmaps")))

+  file.write( 'BKCHEM_IMAGE_PATH="%s"\n' % strip_path( os.path.join( "__PREFIX__", "share/bkchem/images")))

+  file.write( 'BKCHEM_PLUGIN_PATH="%s"\n' % strip_path( os.path.join( "__PREFIX__", "share/bkchem/plugins")))

   file.close()

   print "file %s created" % config_name

@@ -115,7 +115,7 @@

     print "ERROR: couldn't open the file %s for write" %  exec_name

     sys.exit( 201)

   file.write( "#!/bin/sh\n")

-  file.write( 'python %s "$@"\n' % strip_path( os.path.join( py_dir, "bkchem", "bkchem.py")))

+  file.write( '__PYTHON__ __PYTHON_PKGD__/bkchem/bkchem.py "$@"' )

   file.close()

   print "file %s created" % exec_name

   try: