[Pkg-ocaml-maint-commits] [SCM] Debian packaging for coccinelle branch, fixes/system-ocamlsexp, updated. upstream/0.1.9.deb-30-gf68a980

[Eugeniy Meshcheryakov]

The following commit has been merged in the fixes/system-ocamlsexp branch:
commit f68a98048e6c7a2ce85d733df4a0fcf63b2f067a
Merge: ea09507d8a812a00b575fcd8bc1b030b226c4195 526c10523729f0cd60e31c73f10ef1fe39992df2
Author: Eugeniy Meshcheryakov <eugen at debian.org>
Date:   Tue Sep 8 01:27:33 2009 +0200

    Merge commit 'refs/top-bases/fixes/system-ocamlsexp' into fixes/system-ocamlsexp

diff --combined Makefile
index c932c51,b2c2623..d4b24e1
--- a/Makefile
+++ b/Makefile
@@@ -50,7 -50,7 +50,7 @@@ SEXPSYSCMA=bigarray.cma nums.cm
  
  SYSLIBS=str.cma unix.cma $(PYCMA) $(SEXPSYSCMA)
  LIBS=commons/commons.cma \
 -     ocamlsexp/sexplib1.cma commons/commons_sexp.cma \
 +     sexplib.cma commons/commons_sexp.cma \
       globals/globals.cma \
       ctl/ctl.cma \
       parsing_cocci/cocci_parser.cma parsing_c/parsing_c.cma \
@@@ -58,10 -58,10 +58,10 @@@
       extra/extra.cma python/coccipython.cma
  
  #used for clean: and depend: and a little for rec & rec.opt
 -MAKESUBDIRS=commons ocamlsexp \
 +MAKESUBDIRS=commons \
   globals ctl parsing_cocci parsing_c \
   engine extra python
 -INCLUDEDIRS=commons commons/ocamlextra ocamlsexp \
 +INCLUDEDIRS=commons commons/ocamlextra \
   globals $(PYDIR) ctl \
   parsing_cocci parsing_c engine extra python
  
@@@ -93,8 -93,8 +93,8 @@@ OPTFLAGS
  # but is now defined above in this file
  #OPTLIBFLAGS=-cclib dllpycaml_stubs.so
  
 -OCAMLC=ocamlc$(OPTBIN) $(OCAMLCFLAGS)  $(INCLUDES)
 -OCAMLOPT=ocamlopt$(OPTBIN) $(OPTFLAGS) $(INCLUDES)
 +OCAMLC=ocamlc$(OPTBIN) $(OCAMLCFLAGS)  $(INCLUDES) -I $(shell ocamlfind query sexplib)
 +OCAMLOPT=ocamlopt$(OPTBIN) $(OPTFLAGS) $(INCLUDES) -I $(shell ocamlfind query sexplib)
  OCAMLLEX=ocamllex #-ml # -ml for debugging lexer, but slightly slower
  OCAMLYACC=ocamlyacc -v
  OCAMLDEP=ocamldep $(INCLUDES)
@@@ -133,11 -133,13 +133,11 @@@ top: $(EXEC).to
  
  subdirs:
  	$(MAKE) -C commons OCAMLCFLAGS="$(OCAMLCFLAGS)"
 -	$(MAKE) -C ocamlsexp OCAMLCFLAGS="$(OCAMLCFLAGS)"
  	$(MAKE) -C commons sexp OCAMLCFLAGS="$(OCAMLCFLAGS)"
  	+for D in $(MAKESUBDIRS); do $(MAKE) $$D || exit 1 ; done
  
  subdirs.opt:
  	$(MAKE) -C commons all.opt OCAMLCFLAGS="$(OCAMLCFLAGS)"
 -	$(MAKE) -C ocamlsexp all.opt OCAMLCFLAGS="$(OCAMLCFLAGS)"
  	$(MAKE) -C commons sexp.opt OCAMLCFLAGS="$(OCAMLCFLAGS)"
  	+for D in $(MAKESUBDIRS); do $(MAKE) $$D.opt || exit 1 ; done
  
@@@ -207,6 -209,7 +207,7 @@@ static
  purebytecode:
  	rm -f spatch.opt spatch
  	$(MAKE) BYTECODE_STATIC="" spatch
+ 	perl -p -i -e 's/^#!.*/#!\/usr\/bin\/ocamlrun/' spatch
  
  
  ##############################################################################
@@@ -338,7 -341,7 +339,7 @@@ PACKAGE=coccinelle-$(VERSION
  
  BINSRC=spatch env.sh env.csh standard.h standard.iso \
         *.txt \
-        docs/manual/options.pdf docs/manual/cocci_syntax.pdf docs/spatch.1 \
+        docs/manual/manual.pdf docs/manual/options.pdf docs/manual/main_grammar.pdf docs/spatch.1 \
         docs/manual/cocci-python.txt \
         demos/foo.* demos/simple.*
  #      $(PYLIB) python/coccilib/ demos/printloc.*
@@@ -384,8 -387,9 +385,9 @@@ package
  	./configure --without-python
  	make docs
  	make bintar
- 	make staticbintar
  	make bytecodetar
+ 	make staticbintar
+ 
  
  # I currently pre-generate the parser so the user does not have to
  # install menhir on his machine. We could also do a few cleanups.

-- 
Debian packaging for coccinelle