[Pkg-ocaml-maint-commits] r1254 - trunk/packages/cduce/trunk/debian

Stefano Zacchiroli zack@costa.debian.org
Tue, 12 Apr 2005 10:22:15 +0000


Author: zack
Date: 2005-04-12 10:22:14 +0000 (Tue, 12 Apr 2005)
New Revision: 1254

Modified:
   trunk/packages/cduce/trunk/debian/README.Debian
   trunk/packages/cduce/trunk/debian/rules
Log:
- more detailed explanation of ocamlopt vs ocamlc
- explicitly disable netclient when invoking configure


Modified: trunk/packages/cduce/trunk/debian/README.Debian
===================================================================
--- trunk/packages/cduce/trunk/debian/README.Debian	2005-04-12 10:14:01 UTC (rev 1253)
+++ trunk/packages/cduce/trunk/debian/README.Debian	2005-04-12 10:22:14 UTC (rev 1254)
@@ -2,7 +2,7 @@
 ----------------
 
 CDuce for Debian is compiled with:
- - ocamlopt
+ - ocamlopt (on architectures supporting it, with ocamlc elsewhere)
  - ocurl support
  - expat support
  - ocaml interface support

Modified: trunk/packages/cduce/trunk/debian/rules
===================================================================
--- trunk/packages/cduce/trunk/debian/rules	2005-04-12 10:14:01 UTC (rev 1253)
+++ trunk/packages/cduce/trunk/debian/rules	2005-04-12 10:22:14 UTC (rev 1254)
@@ -1,16 +1,5 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-#
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-#
-# Modified to make a template file for a multi-binary package with separated
-# build-arch and build-indep targets  by Bill Allombert 2001
 
-# Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
 # This has to be exported to make some magic below work.
@@ -30,10 +19,11 @@
 
 configure-stamp: configure
 	dh_testdir
-	./configure --prefix=/usr                                \
-                    --mliface=/usr/lib/ocaml/3.08/compiler-libs/ \
-                    --with-curl                                  \
-                    --with-expat                                 \
+	./configure --prefix=/usr					\
+                    --mliface=/usr/lib/ocaml/3.08/compiler-libs/	\
+                    --with-curl						\
+		    --without-netclient					\
+                    --with-expat					\
                     --without-pxp
 	touch configure-stamp
 
@@ -48,7 +38,6 @@
 	dh_testroot
 	rm -f build-stamp
 
-	# Add here commands to clean up after the build process.
 	touch Makefile.conf
 	$(MAKE) $(MAKE_OPTS) clean
 	rm Makefile.conf