[Pkg-ocaml-maint-commits] [SCM] ceve packaging branch, master, updated. debian/1.1-1-13-g4ca51a1

[Ralf Treinen]

The following commit has been merged in the master branch:
commit 2ed725daf371b6fc55ea12c36a72250c2e2bb690
Merge: f981c1c2f33e80554fa0a5765a1ad1d65b3baa2b 9a847c9ad88e4a891cd7d830643bae58b4141118
Author: Ralf Treinen <rt at free.fr>
Date:   Tue Mar 24 22:31:00 2009 +0100

    Merge commit 'upstream/1.2.1'
    
    Conflicts:
    	ceve.1

diff --combined Makefile
index b887930,f6252a2..170a607
--- a/Makefile
+++ b/Makefile
@@@ -20,18 -20,15 +20,18 @@@ egraph_writer.mli dose_writer.mli depen
  cnf_writer.mli graphviz_writer.mli oz_writer.mli
  OBJS = $(OCAML_SOURCES:.ml=.cmo)
  XBJS = $(OCAML_SOURCES:.ml=.cmx)
 -CMIS = $(OCAML_MLIS:.mli=.cmi)
 +CMIS = $(OCAML_MLIS:.mli=.cmi) ceve.cmi
  
- PACKAGES = -package dose2.lifetime,dose2.ocamlpkgsrc,dose2.ocamlrpm,dose2.ocamldeb,dose2.dosebase,expat,str,$(CAMLZIP_NAME)
+ PACKAGES = -package dose2.lifetime,dose2.ocamlpkgsrc,dose2.ocamlrpm,dose2.ocamldeb,dose2.dosebase,str,$(CAMLZIP_NAME)
  #ifdef USE_OCAMLDUCE
- #PACKAGES+=	,ocamlduce
+ #PACKAGES+=	,ocamlduce,expat
  #endif
  
 +all: ceve
 +opt: ceve.opt
 +
  ceve: $(OBJS)
 -	$(OCAMLFIND) ocamlc -thread -custom -o $@ -linkpkg $(PACKAGES) $(C_LIBRARIES) $(CCOPTFLAGS) $(OBJS)
 +	$(OCAMLFIND) ocamlc -thread -o $@ -linkpkg $(PACKAGES) $(C_LIBRARIES) $(CCOPTFLAGS) $(OBJS)
  
  ceve.opt: $(XBJS)
  # bug in ocamlducefind
@@@ -62,7 -59,7 +62,7 @@@ endi
  	$(OCAMLFIND) ocamlopt $(PACKAGES) -c $<
  
  %.cmi: %.mli
 -	$(OCAMLFIND) ocamlopt $(PACKAGES) -c $<
 +	$(OCAMLFIND) ocamlc $(PACKAGES) -c $<
  
  doc: $(CMIS)
  	@rm -rf doc
@@@ -74,12 -71,8 +74,12 @@@ clean
  	@rm -rf ceve ceve.opt doc $(OBJS) $(XBJS) $(CMIS) $(OCAML_SOURCES:.ml=.o)
  
  install: ceve
 -	{ test ! -f ceve.opt || install ceve.opt $(BINDIR); }; \
 -	install ceve $(BINDIR)
 +	mkdir -p $(BINDIR)
 +	if [ -f ceve.opt ] ; then \
 +	  cp ceve.opt $(BINDIR)/ceve ; \
 +	else \
 +	  cp ceve $(BINDIR)/ceve ; \
 +	fi
  
  depend:
  	$(OCAMLFIND) ocamldep $(OCAML_SOURCES) $(OCAML_MLIS) > .depend

-- 
ceve packaging