From eeb3c50796f2f080bf2ba2d0787e43395f436392 Mon Sep 17 00:00:00 2001
From: rich <rich>
Date: Sun, 2 Nov 2003 13:28:38 +0000
Subject: [PATCH] Producing first Debian packages.

---
 .cvsignore        |  4 +++-
 Makefile          | 15 ++++++++-------
 debian/.cvsignore |  4 ++--
 debian/control    |  2 +-
 debian/rules      |  4 ++--
 5 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 571651f..9775c4c 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -5,4 +5,6 @@
 *.cmxa
 perl4caml-*.tar.gz
 html
-META
\ No newline at end of file
+META
+configure-stamp
+build-stamp
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 079aef1..e852966 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 # Interface to Perl from OCaml.
 # Copyright (C) 2003 Merjis Ltd.
-# $Id: Makefile,v 1.13 2003-10-26 10:20:19 rich Exp $
+# $Id: Makefile,v 1.14 2003-11-02 13:28:38 rich Exp $
 
 include Makefile.config
 
@@ -25,7 +25,7 @@ SED := sed
 
 # XXX Hack required by ocamlopt, and sometimes ocamlc.
 # To work out what this should be, try:
-# `shell perl -MExtUtils::Embed -e ldopts'
+# `perl -MExtUtils::Embed -e ldopts'
 DYNALOADER_HACK := /usr/lib/perl/5.8.1/auto/DynaLoader/DynaLoader.a
 
 OCAMLDOCFLAGS := -html -stars -sort $(OCAMLCINCS)
@@ -117,13 +117,14 @@ depend:	.depend
 # Install.
 
 install:
-	rm -rf $(OCAMLLIBDIR)/perl
-	install -c -m 0755 -d $(OCAMLLIBDIR)/perl
-	install -c -m 0755 -d $(OCAMLLIBDIR)/stublibs
+	rm -rf $(DESTDIR)$(OCAMLLIBDIR)/perl
+	install -c -m 0755 -d $(DESTDIR)$(OCAMLLIBDIR)/perl
+	install -c -m 0755 -d $(DESTDIR)$(OCAMLLIBDIR)/stublibs
 	install -c -m 0644 perl.cmi perl.mli perl4caml.cma perl4caml.cmxa \
 	  perl4caml.a libperl4caml.a META \
-	  $(WRAPPERS:.cmo=.ml) $(WRAPPERS:.cmo=.cmi) $(OCAMLLIBDIR)/perl
-	install -c -m 0644 dllperl4caml.so $(OCAMLLIBDIR)/stublibs
+	  $(WRAPPERS:.cmo=.ml) $(WRAPPERS:.cmo=.cmi) \
+	  $(DESTDIR)$(OCAMLLIBDIR)/perl
+	install -c -m 0644 dllperl4caml.so $(DESTDIR)$(OCAMLLIBDIR)/stublibs
 
 # Distribution.
 
diff --git a/debian/.cvsignore b/debian/.cvsignore
index a7866b1..6130b1c 100644
--- a/debian/.cvsignore
+++ b/debian/.cvsignore
@@ -2,6 +2,6 @@
 *.EX
 tmp
 files
-libapache-ocaml
-libapache-ocaml-dev
+libperl-ocaml
+libperl-ocaml-dev
 *.substvars
\ No newline at end of file
diff --git a/debian/control b/debian/control
index 910f03e..c822d38 100644
--- a/debian/control
+++ b/debian/control
@@ -23,7 +23,7 @@ Description: allows you to use Perl code within Objective CAML (OCaml)
 Package: libperl-ocaml
 Section: libs
 Architecture: any
-Depends: libperl, ocaml-base-3.07
+Depends: libperl5.8, ocaml-base-3.07
 Description: allows you to use Perl code within Objective CAML (OCaml)
  perl4caml allows you to use Perl code within Objective CAML (OCaml),
  thus neatly side-stepping the old problem with OCaml which was that it
diff --git a/debian/rules b/debian/rules
index df16012..53017b6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,7 +36,7 @@ install: build
 	dh_clean -k 
 	dh_installdirs
 
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/libapache-ocaml
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/libperl-ocaml
 
 	# Move the remaining development files across.
 	dh_movefiles -plibperl-ocaml-dev --sourcedir=debian/libperl-ocaml
@@ -64,7 +64,7 @@ binary-arch: build install
 #	dh_installinfo
 	dh_installman
 	dh_link
-	dh_strip
+#	dh_strip		# XXX fails - why?
 	dh_compress
 	dh_fixperms
 #	dh_perl
-- 
1.8.3.1