[Pkg-ocaml-maint-commits] [SCM] ocamlgraph packaging branch, master, updated. debian/1.0-2-11-g435c98c
Mehdi Dogguy
dogguy at pps.jussieu.fr
Sat Jul 4 23:12:04 UTC 2009
The following commit has been merged in the master branch:
commit 952a6464e24abf67edd45ca92c6a104b14aa6c25
Author: Mehdi Dogguy <dogguy at pps.jussieu.fr>
Date: Sun Jul 5 00:20:05 2009 +0200
Do not install byte binaries twice
diff --git a/debian/ocamlgraph-editor.links b/debian/ocamlgraph-editor.links
deleted file mode 100644
index 6be4be6..0000000
--- a/debian/ocamlgraph-editor.links
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/share/man/man1/ocamlgraph-editor.1.gz usr/share/man/man1/ocamlgraph-editor.byte.1.gz
-usr/share/man/man1/ocamlgraph-editor.1.gz usr/share/man/man1/ocamlgraph-editor.opt.1.gz
-usr/share/man/man1/ocamlgraph-viewer.1.gz usr/share/man/man1/ocamlgraph-viewer.byte.1.gz
-usr/share/man/man1/ocamlgraph-viewer.1.gz usr/share/man/man1/ocamlgraph-viewer.opt.1.gz
diff --git a/debian/ocamlgraph-editor.links.in b/debian/ocamlgraph-editor.links.in
new file mode 100644
index 0000000..543637b
--- /dev/null
+++ b/debian/ocamlgraph-editor.links.in
@@ -0,0 +1,2 @@
+OPT: usr/share/man/man1/ocamlgraph-editor.1.gz usr/share/man/man1/ocamlgraph-editor.byte.1.gz
+OPT: usr/share/man/man1/ocamlgraph-viewer.1.gz usr/share/man/man1/ocamlgraph-viewer.byte.1.gz
diff --git a/debian/patches/01_makefile.dpatch b/debian/patches/01_makefile.dpatch
index 939b86a..3fade77 100755
--- a/debian/patches/01_makefile.dpatch
+++ b/debian/patches/01_makefile.dpatch
@@ -6,8 +6,8 @@
@DPATCH@
diff -urNad ocamlgraph~/Makefile.in ocamlgraph/Makefile.in
---- ocamlgraph~/Makefile.in 2009-07-04 23:02:52.000000000 +0200
-+++ ocamlgraph/Makefile.in 2009-07-04 23:03:29.000000000 +0200
+--- ocamlgraph~/Makefile.in 2009-07-04 23:43:52.000000000 +0200
++++ ocamlgraph/Makefile.in 2009-07-05 00:17:41.000000000 +0200
@@ -143,10 +143,13 @@
viewer: $(VIEWER_DIR)/viewgraph.byte $(VIEWER_DIR)/viewgraph.$(OCAMLBEST)
@@ -22,7 +22,7 @@ diff -urNad ocamlgraph~/Makefile.in ocamlgraph/Makefile.in
VIEWER_INCLUDES= @INCLUDEGTK2@ -I $(VIEWER_DIR) $(INCLUDES) -I .
-@@ -240,42 +243,16 @@
+@@ -240,49 +243,36 @@
DESTDIR =
@@ -31,11 +31,20 @@ diff -urNad ocamlgraph~/Makefile.in ocamlgraph/Makefile.in
-ifeq ($(OCAMLBEST),byte)
- cp -f $(BINDIR)/graph-editor.byte $(BINDIR)/graph-editor$(EXE)
- cp -f $(BINDIR)/graph-viewer.byte $(BINDIR)/graph-viewer$(EXE)
--else
++ifdef OCAMLFIND
++install-findlib: META install-bin
++ifeq ($(OCAMLBEST),opt)
++ $(OCAMLFIND) install ocamlgraph META $(SRCDIR)/*.mli $(SRCDIR)/view_graph/*.mli view_graph/viewGraph_test.ml \
++ graph$(LIBEXT) graph.cmx graph.o graph.cmo graph.cmi $(CMA) $(CMXA) \
++ $(VIEWER_CMX) $(VIEWER_CMO) $(VIEWER_CMI) $(VIEWER_OFILES)
+ else
- cp -f $(BINDIR)/graph-editor.opt $(BINDIR)/graph-editor$(EXE)
- cp -f $(BINDIR)/graph-viewer.opt $(BINDIR)/graph-viewer$(EXE)
-endif
--endif
++ $(OCAMLFIND) install ocamlgraph META $(SRCDIR)/*.mli $(SRCDIR)/view_graph/*.mli \
++ graph.cmo graph.cmi $(CMA) view_graph/viewGraph_test.ml \
++ $(VIEWER_CMO) $(VIEWER_CMI)
+ endif
-
-install-byte:
- cp -f graph.cmo graph.cmi $(CMA) "$(DESTDIR)$(OCAMLLIB)"
@@ -43,8 +52,8 @@ diff -urNad ocamlgraph~/Makefile.in ocamlgraph/Makefile.in
- cp -f $(ED_DIR)/editor.byte $(BINDIR)/graph-editor.byte
- cp -f $(VIEWER_CMO) "$(DESTDIR)$(OCAMLLIB)"
- cp -f $(VIEWER_DIR)/viewgraph.byte $(BINDIR)/graph-viewer.byte
--endif
--
+ endif
+
-install-opt: install-byte
- cp -f graph$(LIBEXT) graph.cmx $(CMXA) "$(DESTDIR)$(OCAMLLIB)"
-ifeq (@LABLGNOMECANVAS@,yes)
@@ -52,43 +61,34 @@ diff -urNad ocamlgraph~/Makefile.in ocamlgraph/Makefile.in
- cp -f $(VIEWER_CMX) "$(DESTDIR)$(OCAMLLIB)"
- cp -f $(VIEWER_DIR)/viewgraph.opt $(BINDIR)/graph-viewer.opt
-endif
--
++META: META.in Makefile
++ sed -e s/VERSION/$(VERSION)/ -e s/CMA/$(CMA)/ -e s/CMXA/$(CMXA)/ \
++ $@.in > $@
+
-install-findlib: META
- ifdef OCAMLFIND
--ifeq (@LABLGNOMECANVAS@,yes)
-+install-findlib: META install-bin
-+ifeq ($(OCAMLBEST),opt)
- $(OCAMLFIND) install ocamlgraph META $(SRCDIR)/*.mli \
+-ifdef OCAMLFIND
++install-bin:
+ ifeq (@LABLGNOMECANVAS@,yes)
+- $(OCAMLFIND) install ocamlgraph META $(SRCDIR)/*.mli \
- graph$(LIBEXT) graph.cmx graph.cmo graph.cmi $(CMA) $(CMXA) \
- $(VIEWER_CMX) $(VIEWER_CMO)
-+ graph$(LIBEXT) graph.cmx graph.o graph.cmo graph.cmi $(CMA) $(CMXA) \
-+ $(VIEWER_CMX) $(VIEWER_CMO) $(VIEWER_CMI) $(VIEWER_OFILES)
++ cp -f $(ED_DIR)/editor.byte $(BINDIR)/ocamlgraph-editor.byte
++ cp -f $(VIEWER_DIR)/viewgraph.byte $(BINDIR)/ocamlgraph-viewer.byte
++ifeq ($(OCAMLBEST),opt)
++ cp -f $(ED_DIR)/editor.opt $(BINDIR)/ocamlgraph-editor$(EXE)
++ cp -f $(VIEWER_DIR)/viewgraph.opt $(BINDIR)/ocamlgraph-viewer$(EXE)
else
- $(OCAMLFIND) install ocamlgraph META $(SRCDIR)/*.mli \
+- $(OCAMLFIND) install ocamlgraph META $(SRCDIR)/*.mli \
- graph$(LIBEXT) graph.cmx graph.cmo graph.cmi $(CMA) $(CMXA)
-+ graph.cmo graph.cmi $(CMA) \
-+ $(VIEWER_CMO) $(VIEWER_CMI)
++ mv -f $(BINDIR)/ocamlgraph-editor.byte $(BINDIR)/ocamlgraph-editor$(EXE)
++ mv -f $(BINDIR)/ocamlgraph-viewer.byte $(BINDIR)/ocamlgraph-viewer$(EXE)
endif
endif
-@@ -283,6 +260,20 @@
- sed -e s/VERSION/$(VERSION)/ -e s/CMA/$(CMA)/ -e s/CMXA/$(CMXA)/ \
- $@.in > $@
-
-+install-bin:
-+ifeq (@LABLGNOMECANVAS@,yes)
-+ cp -f $(ED_DIR)/editor.byte $(BINDIR)/ocamlgraph-editor.byte
-+ cp -f $(VIEWER_DIR)/viewgraph.byte $(BINDIR)/ocamlgraph-viewer.byte
-+ cp -f $(BINDIR)/ocamlgraph-editor.byte $(BINDIR)/ocamlgraph-editor$(EXE)
-+ cp -f $(BINDIR)/ocamlgraph-viewer.byte $(BINDIR)/ocamlgraph-viewer$(EXE)
-+ifeq ($(OCAMLBEST),opt)
-+ cp -f $(ED_DIR)/editor.opt $(BINDIR)/ocamlgraph-editor.opt
-+ cp -f $(VIEWER_DIR)/viewgraph.opt $(BINDIR)/ocamlgraph-viewer.opt
-+ cp -f $(BINDIR)/ocamlgraph-editor.opt $(BINDIR)/ocamlgraph-editor$(EXE)
-+ cp -f $(BINDIR)/ocamlgraph-viewer.opt $(BINDIR)/ocamlgraph-viewer$(EXE)
-+endif
-+endif
-+
+-META: META.in Makefile
+- sed -e s/VERSION/$(VERSION)/ -e s/CMA/$(CMA)/ -e s/CMXA/$(CMXA)/ \
+- $@.in > $@
+-
# documentation
###############
--
ocamlgraph packaging
More information about the Pkg-ocaml-maint-commits
mailing list