diff options
| author | hiramatsu <hiramatsu> | 2014-04-13 10:39:01 +0000 |
|---|---|---|
| committer | hiramatsu <hiramatsu> | 2014-04-13 10:39:01 +0000 |
| commit | 5ae5767c13e0b4ea1ef96b9c2a6290d5773c7b79 (patch) | |
| tree | 9dcb71d07c8ce3a0a2d3593319447e7572e9c1fc | |
| parent | b2a82dde2c6edac23d23f64f6fa7a4274993f832 (diff) | |
| download | pkgsrc-5ae5767c13e0b4ea1ef96b9c2a6290d5773c7b79.tar.gz | |
Fix buildlink wrapper not to ignore ${DESTDIR}.
ok'ed by MAINTAINER.
| -rw-r--r-- | devel/ocaml-findlib/buildlink3.mk | 3 | ||||
| -rw-r--r-- | devel/ocaml-findlib/files/ocamlfind.sh | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/devel/ocaml-findlib/buildlink3.mk b/devel/ocaml-findlib/buildlink3.mk index 05c5cba4093..472fe5b885e 100644 --- a/devel/ocaml-findlib/buildlink3.mk +++ b/devel/ocaml-findlib/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2012/07/06 09:22:04 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2014/04/13 10:39:01 hiramatsu Exp $ BUILDLINK_TREE+= ocaml-findlib @@ -15,6 +15,7 @@ BUILDLINK_TARGETS+= ocaml-findlib-wrappers ocaml-findlib-ldconf ocaml-findlib-wrappers: ${RUN} \ ${SED} -e 's|@SH@|'${SH:Q}'|g' \ + -e 's|@DESTDIR@|${DESTDIR}|g' \ -e 's|@OCAML_FINDLIB_PREFIX@|${BUILDLINK_PREFIX.ocaml-findlib}|g' \ -e 's|@BUILDLINK_DIR@|${BUILDLINK_DIR}|g' \ < ${.CURDIR}/../../devel/ocaml-findlib/files/ocamlfind.sh \ diff --git a/devel/ocaml-findlib/files/ocamlfind.sh b/devel/ocaml-findlib/files/ocamlfind.sh index 65d749e4c1d..506c303c09d 100644 --- a/devel/ocaml-findlib/files/ocamlfind.sh +++ b/devel/ocaml-findlib/files/ocamlfind.sh @@ -1,6 +1,6 @@ #!@SH@ -# $NetBSD: ocamlfind.sh,v 1.1 2011/06/15 05:25:47 uebayasi Exp $ +# $NetBSD: ocamlfind.sh,v 1.2 2014/04/13 10:39:01 hiramatsu Exp $ args="$@" case "$args" in @@ -9,7 +9,7 @@ case "$args" in case "$args" in *-destdir*) ;; *) - install_args="${install_args} -destdir ${DESTDIR}@OCAML_FINDLIB_PREFIX@/lib/ocaml/site-lib" + install_args="${install_args} -destdir @DESTDIR@@OCAML_FINDLIB_PREFIX@/lib/ocaml/site-lib" ;; esac case "$args" in |