2007-03-13 10:00:12 +01:00
|
|
|
--- setup.py.orig Sun Dec 3 11:37:29 2006
|
|
|
|
|
+++ setup.py Sat Jan 13 07:24:13 2007
|
|
|
|
|
@@ -145,14 +145,25 @@
|
2003-08-11 15:46:37 +02:00
|
|
|
|
2005-06-16 23:50:23 +02:00
|
|
|
prefix = sysconfig.get_config_var("prefix")
|
|
|
|
|
if prefix:
|
|
|
|
|
- add_directory(library_dirs, os.path.join(prefix, "lib"))
|
|
|
|
|
- add_directory(include_dirs, os.path.join(prefix, "include"))
|
|
|
|
|
+ add_directory(library_dirs,
|
|
|
|
|
+ os.path.join(os.getenv("PREFIX"), "lib"))
|
|
|
|
|
+ add_directory(include_dirs,
|
|
|
|
|
+ os.path.join(os.getenv("PREFIX"), "include"))
|
|
|
|
|
+ add_directory(include_dirs,
|
- Remove unneeded dependency from gtk12/gtk20 [1]
- Remove USE_XLIB/USE_X_PREFIX/USE_XPM in favor of USE_XORG
- Remove X11BASE support in favor of LOCALBASE or PREFIX
- Use USE_LDCONFIG instead of INSTALLS_SHLIB
- Remove unneeded USE_GCC 3.4+
Thanks to all Helpers:
Dmitry Marakasov, Chess Griffin, beech@, dinoex, rafan, gahr,
ehaupt, nox, itetcu, flz, pav
PR: 116263
Tested on: pointyhat
Approved by: portmgr (pav)
2008-04-19 19:56:05 +02:00
|
|
|
+ os.path.join(os.getenv("LOCALBASE"), "include"))
|
2003-08-11 15:46:37 +02:00
|
|
|
|
2005-06-16 23:50:23 +02:00
|
|
|
#
|
|
|
|
|
# locate tkinter libraries
|
2003-08-11 15:46:37 +02:00
|
|
|
|
2005-06-16 23:50:23 +02:00
|
|
|
if _tkinter:
|
|
|
|
|
TCL_VERSION = _tkinter.TCL_VERSION[:3]
|
|
|
|
|
+ TK_VERSION = _tkinter.TK_VERSION[:3]
|
|
|
|
|
+ add_directory(include_dirs,
|
|
|
|
|
+ os.path.join(os.getenv("PREFIX"),
|
|
|
|
|
+ "include/tcl%s" % TCL_VERSION))
|
|
|
|
|
+ add_directory(include_dirs,
|
|
|
|
|
+ os.path.join(os.getenv("PREFIX"),
|
|
|
|
|
+ "include/tk%s" % TK_VERSION))
|
|
|
|
|
|
|
|
|
|
if _tkinter and not TCL_ROOT:
|
|
|
|
|
# we have Tkinter but the TCL_ROOT variable was not set;
|
