aballier 14/10/28 08:13:27 Added: ocamlgraph-1.8.5-installfindlib.patch Log: version bump Signed-off-by: [email protected] (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Revision Changes Path 1.1 dev-ml/ocamlgraph/files/ocamlgraph-1.8.5-installfindlib.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ml/ocamlgraph/files/ocamlgraph-1.8.5-installfindlib.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-ml/ocamlgraph/files/ocamlgraph-1.8.5-installfindlib.patch?rev=1.1&content-type=text/plain Index: ocamlgraph-1.8.5-installfindlib.patch =================================================================== Index: ocamlgraph-1.8.5/Makefile.in =================================================================== --- ocamlgraph-1.8.5.orig/Makefile.in +++ ocamlgraph-1.8.5/Makefile.in @@ -417,21 +417,25 @@ ifeq (@LABLGNOMECANVAS@,yes) cp -f $(VIEWER_DIR)/*.mli $(DGRAPH_DIR)/*.mli $(INSTALL_LIBDIR) endif +ifneq ($(WANT_OCAMLOPT),no) +INSTALL_OPT=graph$(LIBEXT) graph.cmx $(CMXA) +INSTALL_GTK_OPT=$(VIEWER_CMXLIB) $(VIEWER_CMXLIB:.cmx=.o) $(DGRAPH_CMXLIB) $(DGRAPH_CMXLIB:.cmx=.o) graph$(OBJEXT) +endif + install-findlib: META ifdef OCAMLFIND -ifeq (@LABLGNOMECANVAS@,yes) +ifeq ($(WANT_GTK),yes) $(OCAMLFIND) install ocamlgraph META \ $(SRCDIR)/*.mli $(VIEWER_DIR)/*.mli $(DGRAPH_DIR)/*.mli \ - graph$(OBJEXT) graph$(LIBEXT) graph.cmx graph.cmo graph.cmi \ - $(CMA) $(CMXA) \ - $(VIEWER_CMXLIB) $(VIEWER_CMOLIB) $(VIEWER_CMILIB) \ - $(VIEWER_CMXLIB:.cmx=.o) \ - $(DGRAPH_CMXLIB) $(DGRAPH_CMOLIB) $(DGRAPH_CMILIB) \ - $(DGRAPH_CMXLIB:.cmx=.o) + $(INSTALL_OPT) graph.cmo graph.cmi \ + $(CMA) \ + $(INSTALL_GTK_OPT) \ + $(VIEWER_CMOLIB) $(VIEWER_CMILIB) \ + $(DGRAPH_CMOLIB) $(DGRAPH_CMILIB) else $(OCAMLFIND) install ocamlgraph META \ $(SRCDIR)/*.mli $(VIEWER_DIR)/*.mli $(DGRAPH_DIR)/*.mli \ - graph$(LIBEXT) graph.cmx graph.cmo graph.cmi $(CMA) $(CMXA) + $(INSTALL_OPT) graph.cmo graph.cmi $(CMA) endif endif
