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-12 22:17:53.614126176 +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 -all: META config.h mod_caml_config.ml mod_caml.so 500mod_caml.info \
26 +all: META config.h mod_caml_config.ml mod_caml.so 150_mod_caml.conf \
28 example-handlers example-scripts example-maillist example-comments \
31 -e 's,@MAILER_ARGS@,$(MAILER_ARGS),g' \
36 echo LoadModule caml_module $(APACHELIBDIR)/mod_caml.so > $@
37 + echo CamlLoad /usr/share/mod_caml/registry.cmo >> $@
39 + echo CamlLoad /usr/lib/ocaml/postgres/postgres.cma >> $@
41 + echo CamlLoad /usr/lib/ocaml/dbi/dbi.cma >> $@
42 + echo CamlLoad /usr/lib/ocaml/dbi/dbi_postgres.cmo >> $@
44 + echo Alias /caml-icons/ /usr/share/mod_caml/caml-icons/ >> $@
45 + echo Alias /caml-bin/ /usr/share/mod_caml/caml-bin/ >> $@
47 + echo \<Location /caml-bin\> >>$@
48 + echo SetHandler ocaml-bytecode >> $@
49 + echo CamlHandler Registry.handler >> $@
50 + echo Options ExecCGI >> $@
51 + echo Allow from all >> $@
52 + echo \<\/Location\> >> $@
56 mod_caml.so: mod_caml_c.o mod_caml.cmo apache_c.o wrappers.o $(ALL_CMOS)
57 $(OCAMLC) -linkall -custom $(OCAMLCFLAGS) $(ALL_CMAS) $^ -o $@ \
60 rm -f *~ *.bak core *.o *.lo *.slo
61 rm -f *.cmi *.cmo *.cmx *.cma *.so *.a
62 - rm -f 500mod_caml.info
63 + rm -f 150_mod_caml.conf
65 for d in examples/simple-scripts examples/useful-scripts \
66 examples/simple-handlers examples/comments; do \
68 $(INSTALL) -m 0755 -d $(DESTDIR)$(APACHELIBDIR)
69 $(INSTALL) -m 0755 -d $(DESTDIR)$(OCAMLAPACHEDIR)
70 $(INSTALL) -m 0755 -d $(DESTDIR)$(MODCAMLLIBDIR)
71 + $(INSTALL) -m 0755 -d $(DESTDIR)$(APACHECONFDIR)
72 $(INSTALL) -c -m 0755 mod_caml.so $(DESTDIR)$(APACHELIBDIR)
73 - $(INSTALL) -c -m 0644 500mod_caml.info $(DESTDIR)$(APACHELIBDIR)
74 + $(INSTALL) -c -m 0644 150_mod_caml.conf $(DESTDIR)$(APACHECONFDIR)/
75 $(INSTALL) -c -m 0644 mod_caml_config.cmi $(DESTDIR)$(OCAMLAPACHEDIR)
76 $(INSTALL) -c -m 0644 apache.mli apache.cmi $(DESTDIR)$(OCAMLAPACHEDIR)
77 $(INSTALL) -c -m 0644 mod_caml.mli mod_caml.cmi \
80 $(INSTALL) -m 0755 -d $(DESTDIR)$(DOCDIR)
81 $(INSTALL) -c -m 0644 AUTHORS FAQ README TODO $(DESTDIR)$(DOCDIR)
82 - $(INSTALL) -c -m 0644 \
83 - examples/simple-scripts/*.ml \
87 $(INSTALL) -m 0755 -d $(DESTDIR)$(DOCDIR)/html
91 $(INSTALL) -m 0755 -d $(DESTDIR)$(APACHECONFDIR)
92 - $(INSTALL) -c -m 0644 modcaml-example.conf $(DESTDIR)$(APACHECONFDIR)
93 + $(INSTALL) -c -m 0644 modcaml-example.conf $(DESTDIR)$(DOCDIR)/
96 $(MAKE) check-manifest
97 diff -urN mod_caml-1.3.4-orig/Makefile.config mod_caml-1.3.4-corrected/Makefile.config
98 --- mod_caml-1.3.4-orig/Makefile.config 2004-11-20 00:12:14.000000000 +0100
99 +++ mod_caml-1.3.4-corrected/Makefile.config 2004-12-05 21:26:59.000000000 +0100
101 # For Apache 1.3, set this to 1
102 # For Apache 2.x, set this to 2
110 # For Apache 1.3, you need to use apxs or /full/path/to/apxs if it's not on
113 # This is where we're going to install mod_caml.so.
115 -APACHELIBDIR := /usr/lib/apache/1.3
116 -#APACHELIBDIR := /usr/lib/apache2/modules
117 +#APACHELIBDIR := /usr/lib/apache/1.3
118 +APACHELIBDIR := /usr/lib/apache
119 #APACHELIBDIR := $(shell pwd)
120 #APACHELIBDIR := /usr/local/apache/libexec
121 #APACHELIBDIR := /usr/lib/mod_caml
124 # Location of the Apache includes.
126 -APACHEINCDIR := /usr/include/apache-1.3
127 +APACHEINCDIR := /usr/include/apache
128 +APRINCDIR := /usr/include/apr
129 +APRUTILINCDIR := /usr/include/apr-util
132 # This is where we're going to install the default mod_caml handlers
135 # Apache configuration directory.
137 -APACHECONFDIR := /etc/apache
138 +APACHECONFDIR := /etc/httpd/httpd.conf/
140 # OCAMLC, OCAMLOPT, OCAMLDOC
141 # The location of the OCaml compiler and tools. The defaults should be OK.
144 # This is where we will install the documentation.
146 -DOCDIR = /usr/share/doc/$(PACKAGE)-$(VERSION)
147 +DOCDIR = /usr/share/doc/apache-$(PACKAGE)-$(VERSION)
150 # Tests whether you have (the OCaml module) Postgres installed. If so, then