[Pkg-ocaml-maint-commits] [ocp-indent] 02/03: modify Makefile.simple

[Johannes Schauer]

This is an automated email from the git hooks/post-receive script.

josch-guest pushed a commit to branch master
in repository ocp-indent.

commit 58baccef85428cfc069f17d8f1293090c96b24a5
Author: josch <j.schauer at email.de>
Date:   Thu Mar 6 14:16:35 2014 +0100

    modify Makefile.simple
---
 debian/patches/Makefile.simple.patch    | 30 ++++++++++++++++++++++++++++++
 debian/patches/install_.mli_files.patch | 12 ------------
 debian/patches/series                   |  2 +-
 3 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/debian/patches/Makefile.simple.patch b/debian/patches/Makefile.simple.patch
new file mode 100644
index 0000000..28e2971
--- /dev/null
+++ b/debian/patches/Makefile.simple.patch
@@ -0,0 +1,30 @@
+--- a/Makefile.simple
++++ b/Makefile.simple
+@@ -9,7 +9,7 @@ COMPAT_DIR = src/ocaml_$(OCAML_MAJOR)/
+ 
+ LIB = ocp-indent-lib
+ 
+-all: $(LIB).cma $(LIB).cmxa
++all: $(LIB).cma $(LIB).cmxa $(LIB).cmxs
+ 
+ src/compat.ml: ALWAYS
+ 	cp $(COMPAT_DIR)/compat.ml src/
+@@ -28,6 +28,9 @@ ALWAYS:
+ %.cmxa: ALWAYS $(GENERATED)
+ 	ocamlbuild src/$@
+ 
++%.cmxs: ALWAYS $(GENERATED)
++	ocamlbuild src/$@
++
+ .PHONY: clean
+ clean:
+ 	rm -rf $(GENERATED) META _build
+@@ -45,5 +48,7 @@ install: _build/src/META $(LIB).cma $(LI
+ 	ocamlfind remove ${LIB} || true
+ 	cd _build/src && ocamlfind install $(LIB) META \
+ 	  $(INTERFACES:=.cmi) \
+-	  $(LIB).cma $(LIB).cmxa $(LIB).a
++	  $(INTERFACES:=.mli) \
++	  $(INTERFACES:=.cmx) \
++	  $(LIB).cma $(LIB).cmxa $(LIB).cmxs $(LIB).a
+ 
diff --git a/debian/patches/install_.mli_files.patch b/debian/patches/install_.mli_files.patch
deleted file mode 100644
index db2eb94..0000000
--- a/debian/patches/install_.mli_files.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Description: also install mli files
-Author: Johannes Schauer <j.schauer at email.de>
-
---- a/Makefile.simple
-+++ b/Makefile.simple
-@@ -45,5 +45,6 @@ install: _build/src/META $(LIB).cma $(LI
- 	ocamlfind remove ${LIB} || true
- 	cd _build/src && ocamlfind install $(LIB) META \
- 	  $(INTERFACES:=.cmi) \
-+	  $(INTERFACES:=.mli) \
- 	  $(LIB).cma $(LIB).cmxa $(LIB).a
- 
diff --git a/debian/patches/series b/debian/patches/series
index 2423954..f2a7e94 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-install_.mli_files.patch
+Makefile.simple.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocp-indent.git