diff options
| author | drochner <drochner@pkgsrc.org> | 2002-01-31 15:48:10 +0000 |
|---|---|---|
| committer | drochner <drochner@pkgsrc.org> | 2002-01-31 15:48:10 +0000 |
| commit | 6ff243b328a68af24c833c04fbdb22cca8c9c2e1 (patch) | |
| tree | 080388ccfcc8a59244844e80b1ef8ab139075dcf | |
| parent | 7d0823fbb41a39474020ffff20ea7fe572f7d777 (diff) | |
| download | pkgsrc-6ff243b328a68af24c833c04fbdb22cca8c9c2e1.tar.gz | |
uhh - EVAL_PREFIX sucks. Do it right now and use buildlink files.
Should fix a building problem reported by Kent Polk.
| -rw-r--r-- | x11/py-Tk/Makefile | 17 | ||||
| -rw-r--r-- | x11/py-Tk/files/setup.py | 21 |
2 files changed, 22 insertions, 16 deletions
diff --git a/x11/py-Tk/Makefile b/x11/py-Tk/Makefile index 4290954399f..7f58cc7763d 100644 --- a/x11/py-Tk/Makefile +++ b/x11/py-Tk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2002/01/28 17:34:29 drochner Exp $ +# $NetBSD: Makefile,v 1.20 2002/01/31 15:48:10 drochner Exp $ # PKGNAME= ${PYPKGPREFIX}-Tk-0 @@ -8,19 +8,17 @@ MAINTAINER= tsarna@netbsd.org HOMEPAGE= http://www.python.org/topics/tkinter/ COMMENT= Tkinter -- Python interface to Tcl/Tk -DEPENDS+= tk>=8.3.2:../../x11/tk -EVAL_PREFIX+= TCLDIR=tcl - -USE_X11= yes - EXTRACT_ELEMENTS= ${PYSUBDIR}/Modules/_tkinter.c \ ${PYSUBDIR}/Modules/tkappinit.c PYDISTUTILSPKG= yes PYBINMODULE= yes PY_PATCHPLIST= yes -PY_SETUP_SUBST+= TCLPREFIX=${TCLDIR} -PY_SETUP_SUBST+= X11PREFIX=${X11BASE} +PY_SETUP_SUBST+= BLPREFIX=${BUILDLINK_DIR} +PY_SETUP_SUBST+= TCLRTPREFIX=${BUILDLINK_PREFIX.tcl} +PY_SETUP_SUBST+= TKRTPREFIX=${BUILDLINK_PREFIX.tk} +PY_SETUP_SUBST+= X11PREFIX=${BUILDLINK_X11_DIR} +PY_SETUP_SUBST+= X11RTPREFIX=${X11BASE} PLIST_SUBST+= PYLIB=${PYLIB} # ignore errors due to missing files (EXTRACT_ELEMENTS!) @@ -38,4 +36,7 @@ post-install: .include "../../lang/python/extension.buildlink.mk" .include "../../lang/python/srcdist.mk" +.include "../../lang/tcl/buildlink.mk" +.include "../../x11/tk/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/py-Tk/files/setup.py b/x11/py-Tk/files/setup.py index 843b26b2a08..b7ae3fa20ee 100644 --- a/x11/py-Tk/files/setup.py +++ b/x11/py-Tk/files/setup.py @@ -1,15 +1,20 @@ -# $NetBSD: setup.py,v 1.1 2002/01/28 17:34:30 drochner Exp $ +# $NetBSD: setup.py,v 1.2 2002/01/31 15:48:11 drochner Exp $ import distutils from distutils.core import setup, Extension -tclprefix = '@TCLPREFIX@' -tclincl = tclprefix + '/include' -tcllib = tclprefix + '/lib' - +blprefix= '@BLPREFIX@' +blincl = blprefix + '/include' +bllib = blprefix + '/lib' +tclrtprefix = '@TCLRTPREFIX@' +tclrtlib = tclrtprefix + '/lib' +tkrtprefix = '@TKRTPREFIX@' +tkrtlib = tkrtprefix + '/lib' x11prefix = '@X11PREFIX@' x11incl = x11prefix + '/include' x11lib = x11prefix + '/lib' +x11rtprefix = '@X11RTPREFIX@' +x11rtlib = x11rtprefix + '/lib' setup( ext_modules = [ @@ -17,9 +22,9 @@ setup( '_tkinter', ['Modules/_tkinter.c', 'Modules/tkappinit.c'], define_macros=[('WITH_APPINIT', None)], - include_dirs=[tclincl, x11incl], - library_dirs=[tcllib, x11lib], - runtime_library_dirs=[tcllib, x11lib], + include_dirs=[blincl, x11incl], + library_dirs=[bllib, x11lib], + runtime_library_dirs=[tclrtlib, tkrtlib, x11rtlib], libraries=['tk83', 'tcl83', 'X11'] ) ] |