[pkgsrc/trunk]: pkgsrc/lang/ocaml Just pass all CPPFLAGS, CFLAGS and LDFLAGS ...

[seb <seb%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5bdc84eadddd
branches:  trunk
changeset: 471716:5bdc84eadddd
user:      seb <seb%pkgsrc.org@localhost>
date:      Tue Mar 30 14:01:30 2004 +0000

description:
Just pass all CPPFLAGS, CFLAGS and LDFLAGS to configure as
${CC} with options or '-libs' specification.

This fix the build of the package with threaded tcl/tk libraries
from the tcl/tk packages.

While here remove FIX_RPATH, bl3 framework takes care of that for us.

diffstat:

 lang/ocaml/Makefile |  12 +++---------
 1 files changed, 3 insertions(+), 9 deletions(-)

diffs (26 lines):

diff -r e3d82abfa39e -r 5bdc84eadddd lang/ocaml/Makefile
--- a/lang/ocaml/Makefile       Tue Mar 30 13:38:50 2004 +0000
+++ b/lang/ocaml/Makefile       Tue Mar 30 14:01:30 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2004/03/11 21:12:22 tron Exp $
+# $NetBSD: Makefile,v 1.26 2004/03/30 14:01:30 seb Exp $
 
 DISTNAME=      ocaml-3.06
 PKGREVISION=   5
@@ -15,14 +15,8 @@
 USE_GNU_TOOLS+=                make
 HAS_CONFIGURE=         yes
 CONFIGURE_ARGS+=       -prefix ${PREFIX}
-CONFIGURE_ARGS+=       -tkdefs "${OCAML_CPPFLAGS}"
-CONFIGURE_ARGS+=       -tklibs "${OCAML_LDFLAGS}"
-CONFIGURE_ARGS+=       -libs "${OCAML_LIBS}"
-
-OCAML_CPPFLAGS=                ${CPPFLAGS}
-OCAML_LDFLAGS=         ${LDFLAGS:M-L*}
-OCAML_LIBS=            ${LDFLAGS:N-L*}
-FIX_RPATH+=            OCAML_LIBS
+CONFIGURE_ARGS+=       -cc "${CC} ${CFLAGS} ${CPPFLAGS}"
+CONFIGURE_ARGS+=       -libs "${LDFLAGS}"
 
 ALL_TARGET=    world