bh: thuban setup.py,1.44,1.44.2.1 ChangeLog,1.624.2.20,1.624.2.21

[cvs@intevation.de]

Author: bh

Update of /thubanrepository/thuban
In directory doto:/tmp/cvs-serv9719

Modified Files:
      Tag: thuban-1-0-branch
	setup.py ChangeLog 
Log Message:
windows build: Removed the absolute path names and
made all prfixes relative to the directory containing setup.py.
Makes it a little easier to adapt to a different system.


Index: setup.py
===================================================================
RCS file: /thubanrepository/thuban/setup.py,v
retrieving revision 1.44
retrieving revision 1.44.2.1
diff -u -d -r1.44 -r1.44.2.1
--- setup.py	22 Dec 2003 17:49:43 -0000	1.44
+++ setup.py	17 Dec 2004 17:51:48 -0000	1.44.2.1
@@ -1,4 +1,4 @@
-# Copyright (c) 2001, 2002, 2003 by Intevation GmbH
+# Copyright (c) 2001, 2002, 2003, 2004 by Intevation GmbH
 # Authors:
 # Bernhard Herzog <bh at intevation.de>
 #
@@ -15,6 +15,7 @@
 # hand below.
 #
 
+import sys
 import os
 from types import TupleType
 import glob
@@ -81,21 +82,23 @@
     #################################################################
     # Windows configuration.
     #
-    
+
+    basedir = os.path.dirname(sys.argv[0])
+
     # Directories where Proj4 is installed
-    proj4_prefix = r"D:\cygwin\home\user\projects\thuban\proj-4.4.7\src"
+    proj4_prefix = os.path.join(basedir, "..", "proj-4.4.7", "src")
     proj4_incdir =  proj4_prefix
     proj4_libdir =  proj4_prefix
     proj4_lib = "proj_i"
 
     # Define include and lib directories for wxWindows and 
-    wx_prefix = r"d:\cygwin\home\user\projects\thuban\wxPython-2.4.0.7"
+    wx_prefix = os.path.join(basedir, "..", "wxPython-2.4.2.4")
     wx_inc = [os.path.join(wx_prefix, 'lib', 'mswdllh'),
               os.path.join(wx_prefix, "include")]
     wx_lib = [os.path.join(wx_prefix, "lib")]
 
     # Define include and lib directories for GDAL 
-    gdal_prefix = r"D:\cygwin\home\user\projects\thuban\gdal-1.1.8"
+    gdal_prefix = os.path.join(basedir, "..", "gdal-1.1.8")
     gdal_inc = [os.path.join(gdal_prefix, 'alg'),
                 os.path.join(gdal_prefix, 'ogr'),
                 os.path.join(gdal_prefix, 'port'),

Index: ChangeLog
===================================================================
RCS file: /thubanrepository/thuban/ChangeLog,v
retrieving revision 1.624.2.20
retrieving revision 1.624.2.21
diff -u -d -r1.624.2.20 -r1.624.2.21
--- ChangeLog	17 Dec 2004 15:54:23 -0000	1.624.2.20
+++ ChangeLog	17 Dec 2004 17:51:48 -0000	1.624.2.21
@@ -1,5 +1,11 @@
 2004-12-17  Bernhard Herzog  <bh at intevation.de>
 
+	* setup.py: windows build: Removed the absolute path names and
+	made all prfixes relative to the directory containing setup.py.
+	Makes it a little easier to adapt to a different system.
+
+2004-12-17  Bernhard Herzog  <bh at intevation.de>
+
 	* Thuban/UI/about.py (unicodeToLocale): Use getdefaultlocale
 	instead of getlocale because it yields a usable encoding name on
 	a german windows 2000