blob: 41127b6c2dc40d6bdbafd0ef2750c5f2a0644a7b (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
|
Patch-Source: https://src.fedoraproject.org/rpms/ocaml-findlib/blob/f28/f/findlib-fix-reinstallation-of-num-for-ocaml-4.06.patch
diff --git a/configure b/configure
index 6a4a558..3f99074 100755
--- a/configure
+++ b/configure
@@ -514,7 +514,10 @@ fi
# dbm?
-if [ -f "${ocaml_core_stdlib}/dbm.cmi" ]; then
+if [ -f "${ocaml_sitelib}/dbm/META" ]; then
+ echo "dbm: package already present"
+ ldbm=""
+elif [ -f "${ocaml_core_stdlib}/dbm.cmi" ]; then
echo "dbm: found"
ldbm="dbm"
else
@@ -524,8 +527,12 @@ fi
# num?
-if [ -f "${ocaml_core_stdlib}/num.cmi" ]; then
- echo "num: found"
+if [ -f "${ocaml_sitelib}/num/META" ]; then
+ echo "num: package already present"
+ lnum=""
+ numtop=""
+elif [ -f "${ocaml_core_stdlib}/num.cmi" ]; then
+ echo "num: found but not as package"
lnum="num num-top"
numtop="num-top"
else
diff --git a/doc/README.xml b/doc/README.xml
index 248483e..0b2b3b5 100644
--- a/doc/README.xml
+++ b/doc/README.xml
@@ -110,6 +110,11 @@ configuration files, and library routines in detail.</p>
<ul>
<li>
+ <p><em>git version:</em> Fix reinstallation of "num" for OCaml-4.06.
+ </p>
+ </li>
+
+ <li>
<p><em>1.7.3:</em> Fix regarding num-top: this library is now also
optional, as num.</p>
</li>
|
