]>
Commit | Line | Data |
---|---|---|
12460213 | 1 | diff -urN mod_caml-1.3.4-orig/Makefile mod_caml-1.3.4-corrected/Makefile |
2 | --- mod_caml-1.3.4-orig/Makefile 2004-11-20 00:12:14.000000000 +0100 | |
3 | +++ mod_caml-1.3.4-corrected/Makefile 2004-12-05 21:23:54.445456776 +0100 | |
4 | @@ -25,16 +25,16 @@ | |
5 | SED := sed | |
6 | ||
7 | CC := $(CC) | |
8 | -CFLAGS := -I $(APACHEINCDIR) -DEAPI | |
9 | +CFLAGS := -I $(APACHEINCDIR) -I $(APRINCDIR) -I $(APRUTILINCDIR) -DEAPI | |
10 | ||
11 | -OCAMLCINCS := -I $(PCRELIBDIR) -I $(APACHEINCDIR) | |
12 | +OCAMLCINCS := -I $(PCRELIBDIR) -I $(APACHEINCDIR) | |
13 | ALL_CMOS := apache.cmo mod_caml_config.cmo mod_caml.cmo cgi_escape.cmo \ | |
14 | template.cmo cgi.cmo | |
15 | ALL_CMXS := cgi_escape.cmx template.cmx | |
16 | ||
17 | OCAMLCFLAGS := -g -w s $(OCAMLCINCS) | |
18 | OCAMLOPTFLAGS := -w s $(OCAMLCINCS) | |
19 | -OCAMLLIBS += -lcamlrun -ltermcap -lunix -lstr | |
20 | +OCAMLLIBS += -lcamlrun -lunix -lstr | |
21 | ALL_CMAS += dynlink.cma str.cma pcre.cma unix.cma | |
22 | ||
23 | OCAMLDOCFLAGS := -html -stars -sort $(OCAMLCINCS) | |
24 | @@ -176,8 +176,9 @@ | |
25 | $(INSTALL) -m 0755 -d $(DESTDIR)$(APACHELIBDIR) | |
26 | $(INSTALL) -m 0755 -d $(DESTDIR)$(OCAMLAPACHEDIR) | |
27 | $(INSTALL) -m 0755 -d $(DESTDIR)$(MODCAMLLIBDIR) | |
28 | + $(INSTALL) -m 0755 -d $(DESTDIR)$(APACHECONFDIR) | |
29 | $(INSTALL) -c -m 0755 mod_caml.so $(DESTDIR)$(APACHELIBDIR) | |
30 | - $(INSTALL) -c -m 0644 500mod_caml.info $(DESTDIR)$(APACHELIBDIR) | |
31 | + $(INSTALL) -c -m 0644 500mod_caml.info $(DESTDIR)$(APACHECONFDIR)/500mod_caml.conf | |
32 | $(INSTALL) -c -m 0644 mod_caml_config.cmi $(DESTDIR)$(OCAMLAPACHEDIR) | |
33 | $(INSTALL) -c -m 0644 apache.mli apache.cmi $(DESTDIR)$(OCAMLAPACHEDIR) | |
34 | $(INSTALL) -c -m 0644 mod_caml.mli mod_caml.cmi \ | |
35 | @@ -232,9 +233,6 @@ | |
36 | install-doc: | |
37 | $(INSTALL) -m 0755 -d $(DESTDIR)$(DOCDIR) | |
38 | $(INSTALL) -c -m 0644 AUTHORS FAQ README TODO $(DESTDIR)$(DOCDIR) | |
39 | - $(INSTALL) -c -m 0644 \ | |
40 | - examples/simple-scripts/*.ml \ | |
41 | - $(DESTDIR)$(DOCDIR) | |
42 | ||
43 | install-html: | |
44 | $(INSTALL) -m 0755 -d $(DESTDIR)$(DOCDIR)/html | |
45 | @@ -242,7 +240,7 @@ | |
46 | ||
47 | install-conf: | |
48 | $(INSTALL) -m 0755 -d $(DESTDIR)$(APACHECONFDIR) | |
49 | - $(INSTALL) -c -m 0644 modcaml-example.conf $(DESTDIR)$(APACHECONFDIR) | |
50 | + $(INSTALL) -c -m 0644 modcaml-example.conf $(DESTDIR)$(DOCDIR)/ | |
51 | ||
52 | dist: | |
53 | $(MAKE) check-manifest | |
54 | diff -urN mod_caml-1.3.4-orig/Makefile.config mod_caml-1.3.4-corrected/Makefile.config | |
55 | --- mod_caml-1.3.4-orig/Makefile.config 2004-11-20 00:12:14.000000000 +0100 | |
56 | +++ mod_caml-1.3.4-corrected/Makefile.config 2004-12-05 21:26:59.182372496 +0100 | |
57 | @@ -25,8 +25,8 @@ | |
58 | # For Apache 1.3, set this to 1 | |
59 | # For Apache 2.x, set this to 2 | |
60 | ||
61 | -APACHE_MAJOR := 1 | |
62 | -#APACHE_MAJOR := 2 | |
63 | +#APACHE_MAJOR := 1 | |
64 | +APACHE_MAJOR := 2 | |
65 | ||
66 | # APXS | |
67 | # For Apache 1.3, you need to use apxs or /full/path/to/apxs if it's not on | |
68 | @@ -42,8 +42,8 @@ | |
69 | # APACHELIBDIR | |
70 | # This is where we're going to install mod_caml.so. | |
71 | ||
72 | -APACHELIBDIR := /usr/lib/apache/1.3 | |
73 | -#APACHELIBDIR := /usr/lib/apache2/modules | |
74 | +#APACHELIBDIR := /usr/lib/apache/1.3 | |
75 | +APACHELIBDIR := /usr/lib/apache | |
76 | #APACHELIBDIR := $(shell pwd) | |
77 | #APACHELIBDIR := /usr/local/apache/libexec | |
78 | #APACHELIBDIR := /usr/lib/mod_caml | |
79 | @@ -52,7 +52,9 @@ | |
80 | # APACHEINCDIR | |
81 | # Location of the Apache includes. | |
82 | ||
83 | -APACHEINCDIR := /usr/include/apache-1.3 | |
84 | +APACHEINCDIR := /usr/include/apache | |
85 | +APRINCDIR := /usr/include/apr | |
86 | +APRUTILINCDIR := /usr/include/apr-util | |
87 | ||
88 | # MODCAMLLIBDIR | |
89 | # This is where we're going to install the default mod_caml handlers | |
90 | @@ -64,7 +66,7 @@ | |
91 | # APACHECONFDIR | |
92 | # Apache configuration directory. | |
93 | ||
94 | -APACHECONFDIR := /etc/apache | |
95 | +APACHECONFDIR := /etc/httpd/httpd.conf/ | |
96 | ||
97 | # OCAMLC, OCAMLOPT, OCAMLDOC | |
98 | # The location of the OCaml compiler and tools. The defaults should be OK. | |
99 | @@ -106,7 +108,7 @@ | |
100 | # DOCDIR | |
101 | # This is where we will install the documentation. | |
102 | ||
103 | -DOCDIR = /usr/share/doc/$(PACKAGE)-$(VERSION) | |
104 | +DOCDIR = /usr/share/doc/apache-$(PACKAGE)-$(VERSION) | |
105 | ||
106 | # HAVE_POSTGRES | |
107 | # Tests whether you have (the OCaml module) Postgres installed. If so, then |