summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dev-ml/findlib/findlib-1.9.5.ebuild14
-rw-r--r--dev-ml/findlib/findlib-1.9.6.ebuild14
2 files changed, 12 insertions, 16 deletions
diff --git a/dev-ml/findlib/findlib-1.9.5.ebuild b/dev-ml/findlib/findlib-1.9.5.ebuild
index 701736ea9f4a..47f06adbaf23 100644
--- a/dev-ml/findlib/findlib-1.9.5.ebuild
+++ b/dev-ml/findlib/findlib-1.9.5.ebuild
@@ -58,18 +58,16 @@ src_install() {
}
check_stublibs() {
- local ocaml_stdlib=`ocamlc -where`
+ local ocaml_stdlib=$(ocamlc -where)
local ldconf="${ocaml_stdlib}/ld.conf"
- if [ ! -e ${ldconf} ]
- then
- echo "${ocaml_stdlib}" > ${ldconf}
- echo "${ocaml_stdlib}/stublibs" >> ${ldconf}
+ if [[ ! -e ${ldconf} ]] ; then
+ echo "${ocaml_stdlib}" > ${ldconf} || die
+ echo "${ocaml_stdlib}/stublibs" >> ${ldconf} || die
fi
- if [ -z `grep -e ${stublibs} ${ldconf}` ]
- then
- echo ${stublibs} >> ${ldconf}
+ if ! grep -qe ${stublibs} ${ldconf} ; then
+ echo ${stublibs} >> ${ldconf} || die
fi
}
diff --git a/dev-ml/findlib/findlib-1.9.6.ebuild b/dev-ml/findlib/findlib-1.9.6.ebuild
index b2e309f4791b..235bfbea3c71 100644
--- a/dev-ml/findlib/findlib-1.9.6.ebuild
+++ b/dev-ml/findlib/findlib-1.9.6.ebuild
@@ -58,18 +58,16 @@ src_install() {
}
check_stublibs() {
- local ocaml_stdlib=`ocamlc -where`
+ local ocaml_stdlib=$(ocamlc -where)
local ldconf="${ocaml_stdlib}/ld.conf"
- if [ ! -e ${ldconf} ]
- then
- echo "${ocaml_stdlib}" > ${ldconf}
- echo "${ocaml_stdlib}/stublibs" >> ${ldconf}
+ if [[ ! -e ${ldconf} ]] ; then
+ echo "${ocaml_stdlib}" > ${ldconf} || die
+ echo "${ocaml_stdlib}/stublibs" >> ${ldconf} || die
fi
- if [ -z `grep -e ${stublibs} ${ldconf}` ]
- then
- echo ${stublibs} >> ${ldconf}
+ if ! grep -qe ${stublibs} ${ldconf} ; then
+ echo ${stublibs} >> ${ldconf} || die
fi
}