- fix config dir

[packages/apache-mod_caml.git] / mod_caml-Makefile.diff

diff -urN mod_caml-1.3.4-orig/Makefile mod_caml-1.3.4-corrected/Makefile
--- mod_caml-1.3.4-orig/Makefile	2004-11-20 00:12:14.000000000 +0100
+++ mod_caml-1.3.4-corrected/Makefile	2004-12-12 22:17:53.614126176 +0100
@@ -25,21 +25,21 @@
 SED := sed
 
 CC	:= $(CC)
-CFLAGS	:= -I $(APACHEINCDIR) -DEAPI
+CFLAGS	:= -I $(APACHEINCDIR) -I $(APRINCDIR) -I $(APRUTILINCDIR) -DEAPI
 
-OCAMLCINCS := -I $(PCRELIBDIR) -I $(APACHEINCDIR)
+OCAMLCINCS := -I $(PCRELIBDIR) -I $(APACHEINCDIR) 
 ALL_CMOS := apache.cmo mod_caml_config.cmo mod_caml.cmo cgi_escape.cmo \
 	template.cmo cgi.cmo
 ALL_CMXS := cgi_escape.cmx template.cmx
 
 OCAMLCFLAGS := -g -w s $(OCAMLCINCS)
 OCAMLOPTFLAGS := -w s $(OCAMLCINCS)
-OCAMLLIBS += -lcamlrun -ltermcap -lunix -lstr 
+OCAMLLIBS += -lcamlrun -lunix -lstr 
 ALL_CMAS += dynlink.cma str.cma pcre.cma unix.cma
 
 OCAMLDOCFLAGS := -html -stars -sort $(OCAMLCINCS)
 
-all:	META config.h mod_caml_config.ml mod_caml.so 500mod_caml.info \
+all:	META config.h mod_caml_config.ml mod_caml.so 150_mod_caml.conf \
 	$(ALL_CMXS) \
 	example-handlers example-scripts example-maillist example-comments \
 	html
@@ -67,8 +67,26 @@
 	-e 's,@MAILER_ARGS@,$(MAILER_ARGS),g' \
 	< $< > $@
 
-500mod_caml.info:
+150_mod_caml.conf:
 	echo LoadModule caml_module $(APACHELIBDIR)/mod_caml.so > $@
+	echo CamlLoad /usr/share/mod_caml/registry.cmo >> $@
+
+	echo CamlLoad /usr/lib/ocaml/postgres/postgres.cma  >> $@
+
+	echo CamlLoad /usr/lib/ocaml/dbi/dbi.cma >> $@
+	echo CamlLoad /usr/lib/ocaml/dbi/dbi_postgres.cmo >> $@
+
+	echo Alias /caml-icons/ /usr/share/mod_caml/caml-icons/ >> $@
+	echo Alias /caml-bin/ /usr/share/mod_caml/caml-bin/ >> $@
+
+	echo \<Location /caml-bin\> >>$@
+	echo        SetHandler ocaml-bytecode >> $@
+	echo        CamlHandler Registry.handler >> $@
+	echo        Options ExecCGI >> $@
+	echo         Allow from all >> $@
+	echo \<\/Location\> >> $@
+
+
 
 mod_caml.so: mod_caml_c.o mod_caml.cmo apache_c.o wrappers.o $(ALL_CMOS)
 	$(OCAMLC) -linkall -custom $(OCAMLCFLAGS) $(ALL_CMAS) $^ -o $@ \
@@ -154,7 +172,7 @@
 clean:
 	rm -f *~ *.bak core *.o *.lo *.slo
 	rm -f *.cmi *.cmo *.cmx *.cma *.so *.a
-	rm -f 500mod_caml.info
+	rm -f 150_mod_caml.conf
 	rm -f examples/*~
 	for d in examples/simple-scripts examples/useful-scripts \
 	    examples/simple-handlers examples/comments; do \
@@ -176,8 +194,9 @@
 	$(INSTALL)    -m 0755 -d $(DESTDIR)$(APACHELIBDIR)
 	$(INSTALL)    -m 0755 -d $(DESTDIR)$(OCAMLAPACHEDIR)
 	$(INSTALL)    -m 0755 -d $(DESTDIR)$(MODCAMLLIBDIR)
+	$(INSTALL)    -m 0755 -d $(DESTDIR)$(APACHECONFDIR)
 	$(INSTALL) -c -m 0755 mod_caml.so $(DESTDIR)$(APACHELIBDIR)
-	$(INSTALL) -c -m 0644 500mod_caml.info $(DESTDIR)$(APACHELIBDIR)
+	$(INSTALL) -c -m 0644 150_mod_caml.conf $(DESTDIR)$(APACHECONFDIR)/
 	$(INSTALL) -c -m 0644 mod_caml_config.cmi $(DESTDIR)$(OCAMLAPACHEDIR)
 	$(INSTALL) -c -m 0644 apache.mli apache.cmi $(DESTDIR)$(OCAMLAPACHEDIR)
 	$(INSTALL) -c -m 0644 mod_caml.mli mod_caml.cmi \
@@ -232,9 +251,6 @@
 install-doc:
 	$(INSTALL)    -m 0755 -d $(DESTDIR)$(DOCDIR)
 	$(INSTALL) -c -m 0644 AUTHORS FAQ README TODO $(DESTDIR)$(DOCDIR)
-	$(INSTALL) -c -m 0644 \
-	  examples/simple-scripts/*.ml \
-	  $(DESTDIR)$(DOCDIR)
 
 install-html:
 	$(INSTALL)    -m 0755 -d $(DESTDIR)$(DOCDIR)/html
@@ -242,7 +258,7 @@
 
 install-conf:
 	$(INSTALL)    -m 0755 -d $(DESTDIR)$(APACHECONFDIR)
-	$(INSTALL) -c -m 0644 modcaml-example.conf $(DESTDIR)$(APACHECONFDIR)
+	$(INSTALL) -c -m 0644 modcaml-example.conf $(DESTDIR)$(DOCDIR)/
 
 dist:
 	$(MAKE) check-manifest
diff -urN mod_caml-1.3.4-orig/Makefile.config mod_caml-1.3.4-corrected/Makefile.config
--- mod_caml-1.3.4-orig/Makefile.config	2004-11-20 00:12:14.000000000 +0100
+++ mod_caml-1.3.4-corrected/Makefile.config	2004-12-05 21:26:59.000000000 +0100
@@ -25,8 +25,8 @@
 # For Apache 1.3, set this to 1
 # For Apache 2.x, set this to 2
 
-APACHE_MAJOR := 1
-#APACHE_MAJOR := 2
+#APACHE_MAJOR := 1
+APACHE_MAJOR := 2
 
 # APXS
 # For Apache 1.3, you need to use apxs or /full/path/to/apxs if it's not on
@@ -42,8 +42,8 @@
 # APACHELIBDIR
 # This is where we're going to install mod_caml.so.
 
-APACHELIBDIR := /usr/lib/apache/1.3
-#APACHELIBDIR := /usr/lib/apache2/modules
+#APACHELIBDIR := /usr/lib/apache/1.3
+APACHELIBDIR := /usr/lib/apache
 #APACHELIBDIR := $(shell pwd)
 #APACHELIBDIR := /usr/local/apache/libexec
 #APACHELIBDIR := /usr/lib/mod_caml
@@ -52,7 +52,9 @@
 # APACHEINCDIR
 # Location of the Apache includes.
 
-APACHEINCDIR := /usr/include/apache-1.3
+APACHEINCDIR := /usr/include/apache
+APRINCDIR := /usr/include/apr
+APRUTILINCDIR := /usr/include/apr-util
 
 # MODCAMLLIBDIR
 # This is where we're going to install the default mod_caml handlers
@@ -64,7 +66,7 @@
 # APACHECONFDIR
 # Apache configuration directory.
 
-APACHECONFDIR := /etc/apache
+APACHECONFDIR := /etc/httpd/httpd.conf/
 
 # OCAMLC, OCAMLOPT, OCAMLDOC
 # The location of the OCaml compiler and tools. The defaults should be OK.
@@ -106,7 +108,7 @@
 # DOCDIR
 # This is where we will install the documentation.
 
-DOCDIR = /usr/share/doc/$(PACKAGE)-$(VERSION)
+DOCDIR = /usr/share/doc/apache-$(PACKAGE)-$(VERSION)
 
 # HAVE_POSTGRES
 # Tests whether you have (the OCaml module) Postgres installed.  If so, then