[Csp-commits] APPLICATIONS/SimData CHANGES.current,1.48,1.49 setup.py,1.24,1.25

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/SimData
In directory sc8-pr-cvs1:/tmp/cvs-serv15341

Modified Files:
	CHANGES.current setup.py 
Log Message:


Index: CHANGES.current
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/CHANGES.current,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** CHANGES.current	22 Jul 2003 07:50:34 -0000	1.48
--- CHANGES.current	22 Jul 2003 18:41:29 -0000	1.49
***************
*** 2,5 ****
--- 2,16 ----
  ===========================
  
+ 2003-07-22: onsight
+             Added a patch by VI to setup.py which improves the 
+ 	    installation path handling under Linux.  This changes the
+ 	    default static library path from /usr/local/lib to
+ 	    {PYTHONLIBPATH}/site-packages/SimData.  The install
+ 	    currently depends on Python, but one goal of SimData is
+ 	    that it should be able to operate as a standalone library
+ 	    independent of Python.  Subsequent changes to the Makefile
+ 	    installation will be needed to achieve this, probably
+ 	    involving a new install target such as install_nopython.
+ 
  2003-07-21: onsight
              COPYING now correctly contains the GPL license, not the

Index: setup.py
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/setup.py,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** setup.py	18 Jul 2003 20:41:08 -0000	1.24
--- setup.py	22 Jul 2003 18:41:29 -0000	1.25
***************
*** 32,38 ****
  min_python_version = "2.2.0"
  
- # this is the default path used by make_install under linux to install the 
- # shared and static libraries.  it can be changed with --prefix=XYZ
- default_libpath = "/usr/local/lib"
  
  if len(sys.argv) == 2:
--- 32,35 ----
***************
*** 87,96 ****
  	incpath = os.path.join(inc, "SimData")
  	localinc = os.path.normpath("Include/SimData")
! 	libpath = default_libpath
  	verbose = 0
  	warnings = 0
  	for arg in args:
  		if arg.startswith("--prefix="):
! 			libpath = arg[9:]
  		elif arg=='-v' or arg=='--verbose':
  			verbose = 1
--- 84,97 ----
  	incpath = os.path.join(inc, "SimData")
  	localinc = os.path.normpath("Include/SimData")
! 	libpath = modpath
! 	prefix = ""
  	verbose = 0
  	warnings = 0
  	for arg in args:
  		if arg.startswith("--prefix="):
! 			prefix = arg[9:]
! 			modpath = os.path.normpath(prefix+modpath)
! 			incpath = os.path.normpath(prefix+incpath)
! 			libpath = os.path.normpath(prefix+libpath)
  		elif arg=='-v' or arg=='--verbose':
  			verbose = 1