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
8 -CFLAGS := -I $(APACHEINCDIR) -DEAPI
9 +CFLAGS := -I $(APACHEINCDIR) -I $(APRINCDIR) -I $(APRUTILINCDIR) -DEAPI
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 \
15 ALL_CMXS := cgi_escape.cmx template.cmx
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
23 OCAMLDOCFLAGS := -html -stars -sort $(OCAMLCINCS)
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 \
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 \
44 $(INSTALL) -m 0755 -d $(DESTDIR)$(DOCDIR)/html
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)/
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
58 # For Apache 1.3, set this to 1
59 # For Apache 2.x, set this to 2
67 # For Apache 1.3, you need to use apxs or /full/path/to/apxs if it's not on
70 # This is where we're going to install mod_caml.so.
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
81 # Location of the Apache includes.
83 -APACHEINCDIR := /usr/include/apache-1.3
84 +APACHEINCDIR := /usr/include/apache
85 +APRINCDIR := /usr/include/apr
86 +APRUTILINCDIR := /usr/include/apr-util
89 # This is where we're going to install the default mod_caml handlers
92 # Apache configuration directory.
94 -APACHECONFDIR := /etc/apache
95 +APACHECONFDIR := /etc/httpd/httpd.conf/
97 # OCAMLC, OCAMLOPT, OCAMLDOC
98 # The location of the OCaml compiler and tools. The defaults should be OK.
101 # This is where we will install the documentation.
103 -DOCDIR = /usr/share/doc/$(PACKAGE)-$(VERSION)
104 +DOCDIR = /usr/share/doc/apache-$(PACKAGE)-$(VERSION)
107 # Tests whether you have (the OCaml module) Postgres installed. If so, then