From ed352ce58c184493e7b24d92a8c0f460942be6c9 Mon Sep 17 00:00:00 2001 From: Stefano Zacchiroli Date: Sun, 2 Sep 2007 17:12:05 +0000 Subject: [PATCH] - better test for package membership to OCAML_OCAMLDOC_PACKAGES --- debian/cdbs/ocaml.mk | 6 +++--- debian/changelog | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/debian/cdbs/ocaml.mk b/debian/cdbs/ocaml.mk index 6d938579..691f2089 100644 --- a/debian/cdbs/ocaml.mk +++ b/debian/cdbs/ocaml.mk @@ -16,7 +16,7 @@ # this program; if not, write to the Free Software Foundation, Inc., 51 # Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # -# $Id: ocaml.mk 4270 2007-09-02 16:00:28Z zack $ +# $Id: ocaml.mk 4274 2007-09-02 17:12:05Z zack $ _cdbs_scripts_path ?= /usr/lib/cdbs _cdbs_rules_path ?= /usr/share/cdbs/1/rules @@ -44,7 +44,7 @@ endif # post-install hook to invoke ocamldoc on OCAML_OCAMLDOC_PACKAGES packages $(patsubst %,binary-install/%,$(DEB_PACKAGES)):: - @if (echo $(OCAML_OCAMLDOC_PACKAGES) | grep -w '$(cdbs_curpkg)' > /dev/null) ; then \ + @if (echo $(OCAML_OCAMLDOC_PACKAGES) | egrep '( |^)$(cdbs_curpkg)( |$$)' > /dev/null) ; then \ echo 'mkdir -p debian/$(cdbs_curpkg)/$(OCAML_OCAMLDOC_DESTDIR_HTML)' ; \ mkdir -p debian/$(cdbs_curpkg)/$(OCAML_OCAMLDOC_DESTDIR_HTML) ; \ echo 'invoking ocamldoc on debian/$(cdbs_curpkg)$(OCAML_STDLIB_DIR)/ ...' ; \ @@ -58,7 +58,7 @@ $(patsubst %,binary-install/%,$(DEB_PACKAGES)):: # post-build hook to create doc-base entries for OCAML_OCAMLDOC_PACKAGES packages $(patsubst %,build/%,$(DEB_PACKAGES)):: - @if (echo $(OCAML_OCAMLDOC_PACKAGES) | grep -w '$(cdbs_curpkg)' > /dev/null) ; then \ + @if (echo $(OCAML_OCAMLDOC_PACKAGES) | egrep '( |^)$(cdbs_curpkg)( |$$)' > /dev/null) ; then \ sed -e 's/@PACKAGE@/$(cdbs_curpkg)/g' \ $(_cdbs_class_path)/ocaml-docbase-template.txt$(_cdbs_makefile_suffix) \ > debian/$(cdbs_curpkg).doc-base.ocamldoc-apiref ; \ diff --git a/debian/changelog b/debian/changelog index 80ec1406..67538de0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,11 +6,12 @@ ocaml (3.10.0-8) unstable; urgency=low likely to generate empty API references ...) - add support for automatic generation of doc-base entries for ocamldoc generated API reference + - better test for package membership to OCAML_OCAMLDOC_PACKAGES * debian/ocaml-base-nox.README.Debian - add an entry describing the requirement for compiling ocamldoc-generated LaTeX documentation (closes: #420782) - -- Stefano Zacchiroli Sun, 02 Sep 2007 18:32:17 +0200 + -- Stefano Zacchiroli Sun, 02 Sep 2007 19:11:14 +0200 ocaml (3.10.0-7) unstable; urgency=low -- 2.30.2