diff options
| author | seb <seb> | 2004-04-12 14:43:39 +0000 |
|---|---|---|
| committer | seb <seb> | 2004-04-12 14:43:39 +0000 |
| commit | 32d6835be497506d23df8c5940abaab4c4157984 (patch) | |
| tree | b74a131261f9bb49f386d5680d7e4b5d3305ea50 /lang/ocaml | |
| parent | ff1798cefd29eeb5bc67730f234454de6cfc51d7 (diff) | |
| download | pkgsrc-32d6835be497506d23df8c5940abaab4c4157984.tar.gz | |
Partialy revert previous and use {TCL,TK}CONFIG_SH's content to pass
more accurate data to configure.
Fix -again now that revision 1.4 of mk/pthread.buildlink3.mk had been
reverted- build with threaded Tcl/Tk packages.
Diffstat (limited to 'lang/ocaml')
| -rw-r--r-- | lang/ocaml/Makefile | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lang/ocaml/Makefile b/lang/ocaml/Makefile index 5d0d83e73b7..7315d570629 100644 --- a/lang/ocaml/Makefile +++ b/lang/ocaml/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2004/03/30 14:01:30 seb Exp $ +# $NetBSD: Makefile,v 1.27 2004/04/12 14:43:39 seb Exp $ DISTNAME= ocaml-3.06 PKGREVISION= 5 @@ -15,7 +15,10 @@ USE_BUILDLINK3= yes USE_GNU_TOOLS+= make HAS_CONFIGURE= yes CONFIGURE_ARGS+= -prefix ${PREFIX} -CONFIGURE_ARGS+= -cc "${CC} ${CFLAGS} ${CPPFLAGS}" +CONFIGURE_ARGS+= -x11include ${X11BASE}/include +CONFIGURE_ARGS+= -x11lib ${X11BASE}/lib +CONFIGURE_ARGS+= -tkdefs "-I${BUILDLINK_PREFIX.tk}/include -I${BUILDLINK_PREFIX.tcl}/include" +CONFIGURE_ARGS+= -tklibs "`${SH} -c '. ${TCLCONFIG_SH}; . ${TKCONFIG_SH}; ${ECHO_N} $$TK_LIBS; ${ECHO_N} \ $$TCL_LIBS'`" CONFIGURE_ARGS+= -libs "${LDFLAGS}" ALL_TARGET= world |