diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2014-09-03 05:47:19 +0000 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2014-09-03 05:47:19 +0000 |
| commit | 7a9dee6dd3e7e00a7601bed507c3e81c6d61016e (patch) | |
| tree | 27bad1d7f9dd0d3c1f002984ff3275425bb7c281 /Mk/bsd.ocaml.mk | |
| parent | 54843cad0ae7e3bbb7365afc29f4eeeaf7709d6e (diff) | |
| download | ports-7a9dee6dd3e7e00a7601bed507c3e81c6d61016e.tar.gz ports-7a9dee6dd3e7e00a7601bed507c3e81c6d61016e.zip | |
Notes
Diffstat (limited to 'Mk/bsd.ocaml.mk')
| -rw-r--r-- | Mk/bsd.ocaml.mk | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/Mk/bsd.ocaml.mk b/Mk/bsd.ocaml.mk index ef8410881a20..48a849456053 100644 --- a/Mk/bsd.ocaml.mk +++ b/Mk/bsd.ocaml.mk @@ -130,7 +130,7 @@ ocaml-findlib: @${FIND} ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/${DIR}/ -type f -print | ${SED} -e \ 's,^${STAGEDIR}${PREFIX}/,,' >> ${TMPPLIST} . endif - @${ECHO_CMD} "@unexec rmdir %D/${OCAML_SITELIBDIR}/${DIR} 2>/dev/null || true" >> ${TMPPLIST} + @${ECHO_CMD} "@dirrmtry ${OCAML_SITELIBDIR}/${DIR}" >> ${TMPPLIST} @${ECHO_CMD} "@unexec ${OCAMLFIND} remove ${DIR} 2>/dev/null" \ >> ${TMPPLIST} . endfor @@ -155,12 +155,10 @@ ocaml-ldconfig: .if defined(USE_OCAML_WASH) . if !target(ocaml-wash) ocaml-wash: - @${ECHO_CMD} "@unexec rmdir %D/${OCAML_SITELIBDIR} 2>/dev/null || true"\ - >> ${TMPPLIST} + @${ECHO_CMD} "@dirrmtry ${OCAML_SITELIBDIR}" >> ${TMPPLIST} # If ld.conf is empty - @${ECHO_CMD} "@unexec if [ ! -s %D/${OCAML_LDCONF} ]; then ${RM} -f %D/${OCAML_LDCONF}; fi || true" >> ${TMPPLIST} - @${ECHO_CMD} "@unexec rmdir %D/${OCAML_LIBDIR} 2>/dev/null || true" \ - >> ${TMPPLIST} + @${ECHO_CMD} "@rmtry ${OCAML_LDCONF}" >> ${TMPPLIST} + @${ECHO_CMD} "@dirrmtry ${OCAML_LIBDIR}" >> ${TMPPLIST} . endif .endif @@ -186,7 +184,7 @@ ocaml-wash: add-plist-post: . if (${PREFIX} != ${LOCALBASE} && \ ${PREFIX} != ${LINUXBASE} && ${PREFIX} != "/usr") - @${ECHO_CMD} "@unexec rmdir %D 2> /dev/null || true" >> ${TMPPLIST} + @${ECHO_CMD} "@dirrmtry ${PREFIX}" >> ${TMPPLIST} . else @${DO_NADA} . endif @@ -194,8 +192,7 @@ add-plist-post: # If we are using PORTDOCS macro port cannot delete OCAML_DOCSDIR, so # we shoud try to accomodate it . if defined(PORTDOCS) - @${ECHO_CMD} "@unexec rmdir ${OCAML_DOCSDIR} 2>/dev/null || true" \ - >> ${TMPPLIST} + @${ECHO_CMD} "@dirrmtry ${OCAML_DOCSDIR}" >> ${TMPPLIST} . endif .endif |