From 1f6e0a98c69a2cc0839f8317dfa6ca101da5d043 Mon Sep 17 00:00:00 2001
From: rich <rich>
Date: Wed, 15 Oct 2003 08:55:23 +0000
Subject: [PATCH] 'make install' now installs wrappers, and everything under
 $OCAMLLIBDIR/perl. Updated MANIFEST.

---
 MANIFEST        |  3 +++
 Makefile        | 13 ++++++-------
 Makefile.config |  5 +++--
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/MANIFEST b/MANIFEST
index 0ff5377..19e7814 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,8 +1,11 @@
 .cvsignore
 .depend
+AUTHORS
+COPYING.LIB
 Makefile
 Makefile.config
 MANIFEST
+README
 examples/.cvsignore
 examples/google.ml
 examples/loadpage.ml
diff --git a/Makefile b/Makefile
index 1365ff1..e02a6d6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 # Interface to Perl from OCaml.
 # Copyright (C) 2003 Merjis Ltd.
-# $Id: Makefile,v 1.7 2003-10-14 16:05:21 rich Exp $
+# $Id: Makefile,v 1.8 2003-10-15 08:55:23 rich Exp $
 
 include Makefile.config
 
@@ -33,8 +33,7 @@ WRAPPERS := \
 	wrappers/pl_HTTP_Message.cmo \
 	wrappers/pl_HTTP_Request.cmo \
 	wrappers/pl_HTTP_Response.cmo \
-	wrappers/pl_LWP_UserAgent.cmo \
-	wrappers/pl_Net_Google.cmo
+	wrappers/pl_LWP_UserAgent.cmo
 
 all:	perl.cma perl.cmxa perl_init.cmo perl_init.cmx all-examples
 
@@ -99,11 +98,11 @@ depend:	.depend
 # Install.
 
 install:
-	install -c -m 0755 -d $(OCAMLLIBDIR)
+	install -c -m 0755 -d $(OCAMLLIBDIR)/perl
 	install -c -m 0755 -d $(OCAMLLIBDIR)/stublibs
-	install -c -m 0644 perl.cmi perl.mli perl.cma perl.cmxa $(OCAMLLIBDIR)
-	install -c -m 0644 perl_init.cmo perl_init.cmx $(OCAMLLIBDIR)
-	install -c -m 0644 perl.a libperl.a $(OCAMLLIBDIR)
+	install -c -m 0644 perl.cmi perl.mli perl.cma perl.cmxa \
+	  perl_init.cmo perl_init.cmx perl.a libperl.a \
+	  $(WRAPPERS:.cmo=.ml) $(WRAPPERS:.cmo=.cmi) $(OCAMLLIBDIR)/perl
 	install -c -m 0644 dllperl.so $(OCAMLLIBDIR)/stublibs
 
 # Distribution.
diff --git a/Makefile.config b/Makefile.config
index 69129b9..00c2abd 100644
--- a/Makefile.config
+++ b/Makefile.config
@@ -1,5 +1,5 @@
 # perl4caml configuration -*- Makefile -*-
-# $Id: Makefile.config,v 1.5 2003-10-14 16:46:13 rich Exp $
+# $Id: Makefile.config,v 1.6 2003-10-15 08:55:23 rich Exp $
 
 # PERLINCDIR
 # Directory containing the Perl include files, eg. <EXTERN.h>.
@@ -7,7 +7,8 @@
 PERLINCDIR := $(shell perl -MConfig -e 'print "$$Config{archlib}/CORE"')
 
 # OCAMLLIBDIR
-# This is where we will install perl4caml.
+# This is where we will install perl4caml (actually in the /perl subdirectory
+# of this, so you will need to add '-I +perl' when compiling programs).
 
 OCAMLLIBDIR := $(shell ocamlc -where)
 
-- 
1.8.3.1