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
50
|
#! /bin/sh /usr/share/dpatch/dpatch-run
## 23_include.dpatch by Stefano Zacchiroli <zack@debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: support for an extra, debian-specific, dir where to look for
## DP: configuration file snippets (namely /usr/share/ocaml-findlib/)
@DPATCH@
diff -urNad trunk~/src/findlib/findlib_config.mlp trunk/src/findlib/findlib_config.mlp
--- trunk~/src/findlib/findlib_config.mlp 2005-11-01 01:36:35.000000000 +0100
+++ trunk/src/findlib/findlib_config.mlp 2005-11-27 22:57:44.000000000 +0100
@@ -4,6 +4,7 @@
*)
let config_file = "@CONFIGFILE@";;
+let extra_configd_file = "/usr/share/ocaml-findlib/";; (* Debian specific *)
let ocaml_stdlib = "@STDLIB@";;
diff -urNad trunk~/src/findlib/findlib.ml trunk/src/findlib/findlib.ml
--- trunk~/src/findlib/findlib.ml 2005-11-01 01:36:35.000000000 +0100
+++ trunk/src/findlib/findlib.ml 2005-11-27 22:58:07.000000000 +0100
@@ -99,6 +99,8 @@
let configd_file =
config_file ^ ".d" in
+ let extra_configd_file = Findlib_config.extra_configd_file in
+
let vars_of_file f =
let ch = open_in config_file in
try
@@ -136,12 +138,17 @@
vars_of_file config_file
else
[] in
+ let extra_configd_vars = (* Debian specific *)
+ if Sys.file_exists extra_configd_file then
+ vars_of_dir extra_configd_file
+ else
+ [] in
let configd_vars =
if Sys.file_exists configd_file then
vars_of_dir configd_file
else
[] in
- let vars = config_vars @ configd_vars in
+ let vars = extra_configd_vars @ config_vars @ configd_vars in
if vars <> [] then (
let lookup name default =
try Fl_metascanner.lookup name config_preds vars
|
