PATCH: correct HTML manual installation

[zefram@xxxxxxxx]

Clint Adams wrote:
>I assume since there's no mention of it in Zefram's list of changes,
>that this was an unintentional omission in 8950.

Sorry.  The unintentional omission was from the list of changes.
I removed the HTML installation because it required a $(htmldir) which
wasn't set anywhere: I concluded that it can't have actually been used
by anyone, and so removed it rather than doing more name transform
stuff for it.  But now that I have a bit more time, here's a patch to
do it properly.  This should be applied INSTEAD of Clint's 8958/8959/8960.

-zefram

diff -cr ../zsh-/Config/defs.mk.in ./Config/defs.mk.in
*** ../zsh-/Config/defs.mk.in	Wed Dec  8 19:58:26 1999
--- ./Config/defs.mk.in	Thu Dec  9 10:17:36 1999
***************
*** 39,45 ****
--- 39,47 ----
  MODDIR          = $(libdir)/$(tzsh)/$(VERSION)
  infodir         = @infodir@
  mandir          = @mandir@
+ datadir         = @datadir@
  fndir           = @fndir@
+ htmldir         = $(datadir)/$(tzsh)/htmldoc
  
  # compilation
  CC              = @CC@
***************
*** 77,82 ****
--- 79,85 ----
  MAKEDEFS = \
  prefix='$(prefix)' exec_prefix='$(exec_prefix)' bindir='$(bindir)' \
  libdir='$(libdir)' MODDIR='$(MODDIR)' infodir='$(infodir)' mandir='$(mandir)' \
+ datadir='$(datadir)' fndir='$(fndir)' htmldir='$(htmldir)' \
  CC='$(CC)' CPPFLAGS='$(CPPFLAGS)' DEFS='$(DEFS)' CFLAGS='$(CFLAGS)' \
  LDFLAGS='$(LDFLAGS)' EXTRA_LDFLAGS='$(EXTRA_LDFLAGS)' \
  DLCFLAGS='$(DLCFLAGS)' DLLDFLAGS='$(DLLDFLAGS)' \
diff -cr ../zsh-/Doc/Makefile.in ./Doc/Makefile.in
*** ../zsh-/Doc/Makefile.in	Wed Dec  8 19:58:26 1999
--- ./Doc/Makefile.in	Thu Dec  9 10:22:57 1999
***************
*** 210,215 ****
--- 210,226 ----
  	rm -f $(DESTDIR)$(infodir)/$(tzsh).info
  	rm -f $(DESTDIR)$(infodir)/$(tzsh).info-[1-9]*
  
+ # install HTML manual
+ install.html: zsh_toc.html
+ 	$(sdir_top)/mkinstalldirs $(DESTDIR)$(htmldir)
+ 	for file in zsh_*.html; do \
+ 	    $(INSTALL_DATA) $$file $(DESTDIR)$(htmldir) || exit 1; \
+ 	done
+ 
+ # uninstall HTML manual
+ uninstall.html:
+ 	rm -f $(DESTDIR)$(htmldir)/zsh_*.html
+ 
  # ========== DEPENDENCIES FOR CLEANUP ==========
  
  clean-here:
diff -cr ../zsh-/Makefile.in ./Makefile.in
*** ../zsh-/Makefile.in	Wed Dec  8 20:29:33 1999
--- ./Makefile.in	Thu Dec  9 10:13:43 1999
***************
*** 59,65 ****
  install-strip:
  	$(MAKE) install STRIPFLAGS="-s"
  
! # install/uninstall everything (except info)
  install: install.bin install.modules install.man install.fns
  uninstall: uninstall.bin uninstall.modules uninstall.man uninstall.fns
  
--- 59,65 ----
  install-strip:
  	$(MAKE) install STRIPFLAGS="-s"
  
! # install/uninstall most things
  install: install.bin install.modules install.man install.fns
  uninstall: uninstall.bin uninstall.modules uninstall.man uninstall.fns
  
***************
*** 82,87 ****
--- 82,91 ----
  
  # install/uninstall just the info pages
  install.info uninstall.info:
+ 	@cd Doc && $(MAKE) $(MAKEDEFS) $@
+ 
+ # install/uninstall just the HTML manual
+ install.html uninstall.html:
  	@cd Doc && $(MAKE) $(MAKEDEFS) $@
  
  # ========== DEPENDENCIES FOR TESTING ==========
END