The following commit has been merged in the master branch:
commit d348a2fb13b55296bca819a121cdfce2e2f04f2d
Author: Stephane Glondu <[email protected]>
Date: Mon Feb 16 07:48:02 2009 +0100
Update install_missing_cmi.dpatch
diff --git a/debian/patches/install_missing_cmi.dpatch
b/debian/patches/install_missing_cmi.dpatch
index 79c613d..2c58cd3 100755
--- a/debian/patches/install_missing_cmi.dpatch
+++ b/debian/patches/install_missing_cmi.dpatch
@@ -5,15 +5,16 @@
## DP: install missing .cmi, in particular fl_metatoken.cmi
@DPATCH@
-diff -urNad trunk~/src/findlib/Makefile trunk/src/findlib/Makefile
---- trunk~/src/findlib/Makefile 2007-11-13 14:31:45.000000000 +0100
-+++ trunk/src/findlib/Makefile 2007-12-29 12:16:13.000000000 +0100
-@@ -81,7 +81,7 @@
- mkdir -p $(prefix)$(OCAML_SITELIB)/$(NAME)
- mkdir -p $(prefix)$(OCAMLFIND_BIN)
- test $(INSTALL_TOPFIND) -eq 0 || cp topfind
$(prefix)$(OCAML_CORE_STDLIB)
+diff --git a/src/findlib/Makefile b/src/findlib/Makefile
+index 8a16fdb..3526ca7 100644
+--- a/src/findlib/Makefile
++++ b/src/findlib/Makefile
+@@ -81,7 +81,7 @@ install: all
+ mkdir -p "$(prefix)$(OCAML_SITELIB)/$(NAME)"
+ mkdir -p "$(prefix)$(OCAMLFIND_BIN)"
+ test $(INSTALL_TOPFIND) -eq 0 || cp topfind
"$(prefix)$(OCAML_CORE_STDLIB)"
- files=`$(TOP)/tools/collect_files $(TOP)/Makefile.config findlib.cmi
findlib.mli findlib.cma topfind.cmi topfind.mli fl_package_base.mli
fl_package_base.cmi fl_metascanner.mli fl_metascanner.cmi findlib_top.cma
findlib.cmxa findlib.a META` && \
+ files=`$(TOP)/tools/collect_files $(TOP)/Makefile.config findlib.cmi
findlib.mli findlib.cma topfind.cmi topfind.mli fl_package_base.mli
fl_package_base.cmi fl_metascanner.mli fl_metascanner.cmi fl_metatoken.cmi
findlib_top.cma findlib.cmxa findlib.a META` && \
- cp $$files $(prefix)$(OCAML_SITELIB)/$(NAME)
+ cp $$files "$(prefix)$(OCAML_SITELIB)/$(NAME)"
f="ocamlfind$(EXEC_SUFFIX)"; { test -f ocamlfind_opt$(EXEC_SUFFIX) &&
f="ocamlfind_opt$(EXEC_SUFFIX)"; }; \
- cp $$f $(prefix)$(OCAMLFIND_BIN)/ocamlfind$(EXEC_SUFFIX)
+ cp $$f "$(prefix)$(OCAMLFIND_BIN)/ocamlfind$(EXEC_SUFFIX)"
--
findlib packaging
_______________________________________________
Pkg-ocaml-maint-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits
