diff options
| author | jlam <jlam@pkgsrc.org> | 2003-03-14 19:37:30 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2003-03-14 19:37:30 +0000 |
| commit | 3ef633718c6eecbd852195de9329d45632a10352 (patch) | |
| tree | 4ee2e06249d68477cf3fb68be1f095453bcec90d /lang/ocaml | |
| parent | 1940384395085677c2036358dfcccfad791a4dd8 (diff) | |
| download | pkgsrc-3ef633718c6eecbd852195de9329d45632a10352.tar.gz | |
(1) Publicly export the value of _OPSYS_RPATH_NAME as RPATH_FLAG;
Makefiles simply need to use this value often, for better or for
worse.
(2) Create a new variable FIX_RPATH that lists variables that should
be cleansed of -R or -rpath values if ${_USE_RPATH} is "no". By
default, FIX_RPATH contains LIBS, X11_LDFLAGS, and LDFLAGS, and
additional variables may be appended from package Makefiles.
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 d243a836199..9391bd525d3 100644 --- a/lang/ocaml/Makefile +++ b/lang/ocaml/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2002/08/22 02:56:51 jschauma Exp $ +# $NetBSD: Makefile,v 1.13 2003/03/14 19:37:42 jlam Exp $ # DISTNAME= ocaml-3.06 @@ -16,7 +16,10 @@ HAS_CONFIGURE= yes CONFIGURE_ARGS+= -prefix ${LOCALBASE} CONFIGURE_ARGS+= -tklibs -L${LOCALBASE}/lib CONFIGURE_ARGS+= -tkdefs "-I${LOCALBASE}/include " -CONFIGURE_ARGS+= -libs "-Wl,-R${X11BASE}/lib -Wl,-R${LOCALBASE}/lib" +CONFIGURE_ARGS+= -libs "${OCAML_LDFLAGS}" +OCAML_LDFLAGS= -Wl,${RPATH_FLAG}${X11BASE}/lib \ + -Wl,${RPATH_FLAG}${LOCALBASE}/lib +FIX_RPATH+= OCAML_LDFLAGS ALL_TARGET= world |