0.1.6

4 files changed, 30 insertions, 39 deletions

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 3dc473f..7dd658e 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -2,14 +2,8 @@ man_MANS = bbe.1
 info_TEXINFOS = bbe.texi
 CLEANFILES = bbe.html
 
-docdir = $(datadir)/doc
-doc_DATA = bbe.html
-AM_MAKEINFOHTMLFLAGS=--no-split
+htmldir=$(datadir)/doc/$(PACKAGE)
+html_DATA = bbe.html
+AM_MAKEINFOHTMLFLAGS = --no-split
 
-bbe.html: bbe.texi bbe.info
-
-html: bbe.html
-
-.PHONY: html
-
-EXTRA_DIST = $(man_MANS) $(info_TEXINFOS) $(doc_DATA)
+EXTRA_DIST = $(man_MANS) $(info_TEXINFOS) $(html_DATA)
diff --git a/doc/Makefile.in b/doc/Makefile.in
index d0a0764..77e741a 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -60,7 +60,7 @@ TEXI2PDF = $(TEXI2DVI) --pdf --batch
 MAKEINFOHTML = $(MAKEINFO) --html
 DVIPS = dvips
 am__installdirs = "$(DESTDIR)$(infodir)" "$(DESTDIR)$(man1dir)" \
-	"$(DESTDIR)$(docdir)"
+	"$(DESTDIR)$(htmldir)"
 man1dir = $(mandir)/man1
 NROFF = nroff
 MANS = $(man_MANS)
@@ -70,8 +70,8 @@ am__vpath_adj = case $$p in \
     *) f=$$p;; \
   esac;
 am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-docDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(doc_DATA)
+htmlDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(html_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMDEP_FALSE = @AMDEP_FALSE@
@@ -156,10 +156,10 @@ target_alias = @target_alias@
 man_MANS = bbe.1
 info_TEXINFOS = bbe.texi
 CLEANFILES = bbe.html
-docdir = $(datadir)/doc
-doc_DATA = bbe.html
+htmldir = $(datadir)/doc/$(PACKAGE)
+html_DATA = bbe.html
 AM_MAKEINFOHTMLFLAGS = --no-split
-EXTRA_DIST = $(man_MANS) $(info_TEXINFOS) $(doc_DATA)
+EXTRA_DIST = $(man_MANS) $(info_TEXINFOS) $(html_DATA)
 all: all-am
 
 .SUFFIXES:
@@ -242,6 +242,7 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 $(srcdir)/bbe.info: bbe.texi 
 bbe.dvi: bbe.texi 
 bbe.pdf: bbe.texi 
+bbe.html: bbe.texi 
 .dvi.ps:
 	TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
 	$(DVIPS) -o $@ $<
@@ -339,22 +340,22 @@ uninstall-man1:
 	  echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \
 	  rm -f "$(DESTDIR)$(man1dir)/$$inst"; \
 	done
-install-docDATA: $(doc_DATA)
+install-htmlDATA: $(html_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(docdir)" || $(mkdir_p) "$(DESTDIR)$(docdir)"
-	@list='$(doc_DATA)'; for p in $$list; do \
+	test -z "$(htmldir)" || $(mkdir_p) "$(DESTDIR)$(htmldir)"
+	@list='$(html_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  f=$(am__strip_dir) \
-	  echo " $(docDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(docdir)/$$f'"; \
-	  $(docDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(docdir)/$$f"; \
+	  echo " $(htmlDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(htmldir)/$$f'"; \
+	  $(htmlDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(htmldir)/$$f"; \
 	done
 
-uninstall-docDATA:
+uninstall-htmlDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(doc_DATA)'; for p in $$list; do \
+	@list='$(html_DATA)'; for p in $$list; do \
 	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(docdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(docdir)/$$f"; \
+	  echo " rm -f '$(DESTDIR)$(htmldir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(htmldir)/$$f"; \
 	done
 tags: TAGS
 TAGS:
@@ -397,7 +398,7 @@ check-am: all-am
 check: check-am
 all-am: Makefile $(INFO_DEPS) $(MANS) $(DATA)
 installdirs:
-	for dir in "$(DESTDIR)$(infodir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(docdir)"; do \
+	for dir in "$(DESTDIR)$(infodir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(htmldir)"; do \
 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
 	done
 install: install-am
@@ -437,13 +438,15 @@ dvi: dvi-am
 
 dvi-am: $(DVIS)
 
+html: html-am
+
 html-am: $(HTMLS)
 
 info: info-am
 
 info-am: $(INFO_DEPS)
 
-install-data-am: install-docDATA install-info-am install-man
+install-data-am: install-htmlDATA install-info-am install-man
 
 install-exec-am:
 
@@ -500,27 +503,21 @@ ps: ps-am
 
 ps-am: $(PSS)
 
-uninstall-am: uninstall-docDATA uninstall-info-am uninstall-man
+uninstall-am: uninstall-htmlDATA uninstall-info-am uninstall-man
 
 uninstall-man: uninstall-man1
 
 .PHONY: all all-am check check-am clean clean-generic dist-info \
 	distclean distclean-generic distdir dvi dvi-am html html-am \
 	info info-am install install-am install-data install-data-am \
-	install-docDATA install-exec install-exec-am install-info \
+	install-exec install-exec-am install-htmlDATA install-info \
 	install-info-am install-man install-man1 install-strip \
 	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-aminfo maintainer-clean-generic mostlyclean \
 	mostlyclean-aminfo mostlyclean-generic pdf pdf-am ps ps-am \
-	uninstall uninstall-am uninstall-docDATA uninstall-info-am \
+	uninstall uninstall-am uninstall-htmlDATA uninstall-info-am \
 	uninstall-man uninstall-man1
 
-
-bbe.html: bbe.texi bbe.info
-
-html: bbe.html
-
-.PHONY: html
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/doc/bbe.html b/doc/bbe.html
index 5f266e3..0066ea9 100644
--- a/doc/bbe.html
+++ b/doc/bbe.html
@@ -486,7 +486,7 @@ The start sequence is not printed.<br>
 
      <br><dt><span class="samp">bbe -b "/\xff\xd8\xff/:/\xff\xd9/" -s -e "w pic%02B.jpg" -o /dev/null manual.pdf</span><dd>Extract jpg-images from pdf-file to separate jpg-files (assuming that the jpg start/stop sequences
 does not appear in other context than jpg-images). 
-Files will be named as <span class="file">pic01.jpg</span>, <span class="file">pic02.jpg</span>, <span class="file">pic03.jpg</span>,... 
+Files will be named as <span class="file">pic01.jpg</span>, <span class="file">pic02.jpg</span>, <span class="file">pic03.jpg</span>,<small class="dots">...</small>
 </dl>
 
 <div class="node">
diff --git a/doc/bbe.texi b/doc/bbe.texi
index 00f3f74..1224b9a 100644
--- a/doc/bbe.texi
+++ b/doc/bbe.texi
@@ -6,7 +6,7 @@
 @finalout
 @c %**end of header
 
-@set VERSION 0.1.5
+@set VERSION 0.1.6
 
 @copying
 This file documents the @command{bbe} - binary block editor
@@ -525,7 +525,7 @@ The least significant nybble of bytes after @code{x5f} is cleared.@*
 @item bbe -b "/\xff\xd8\xff/:/\xff\xd9/" -s -e "w pic%02B.jpg" -o /dev/null manual.pdf
 Extract jpg-images from pdf-file to separate jpg-files (assuming that the jpg start/stop sequences
 does not appear in other context than jpg-images). 
-Files will be named as @file{pic01.jpg}, @file{pic02.jpg}, @file{pic03.jpg},...
+Files will be named as @file{pic01.jpg}, @file{pic02.jpg}, @file{pic03.jpg},@dots{}
 @end table