RE: PATCH: zsh-3.1.5-pws-5: creating info dir entry with install.info

RE: PATCH: zsh-3.1.5-pws-5: creating info dir entry with install.info

[Andrej Borsenkow]

>
> Thanks.  BTW, it would be more "standard" for there to be a
> separate target
> in the Makefile, "make install-info", which has to be done separately from
> "make install".
>


It is not my choice. I am all for it, but it was not me who wrote Makefile.
So I Cc it to zsh-workers for general discussion.

/andrej

PATCH: zsh-3.1.5-pws-5: install.info

[Peter Stephenson]

"Andrej Borsenkow" wrote:
> > Thanks.  BTW, it would be more "standard" for there to be a
> > separate target
> > in the Makefile, "make install-info", which has to be done separately from
> > "make install".
> 
> It is not my choice. I am all for it, but it was not me who wrote Makefile.
> So I Cc it to zsh-workers for general discussion.

Fine by me, though it's still called install.info to fit in with
everything else.

--- Doc/Makefile.in.inst	Tue Jan 26 14:42:53 1999
+++ Doc/Makefile.in	Wed Jan 27 09:55:20 1999
@@ -112,11 +112,11 @@
 
 # ========== DEPENDENCIES FOR INSTALLING ==========
 
-# install all the documentation
-install: install.man install.info
+# install just installs the manual pages
+install: install.man
 
-# uninstall all the documentation
-uninstall: uninstall.man uninstall.info
+# uninstall just unistalls the manual pages
+uninstall: uninstall.man
 
 # install man pages, creating install directory if necessary
 install.man: $(MAN)
--- INSTALL.inst	Wed Oct 28 22:24:06 1998
+++ INSTALL	Wed Jan 27 09:51:56 1999
@@ -114,15 +114,18 @@
 To install the zsh man page, do the command:
     make install.man
 
-To install the zsh info files, do the command:
-    make install.info
-
 Or alternatively, you can install all the above with the command:
     make install
 
-"make install.info" will only move the info files into the info directory.
-You will have to edit the topmost node of the info tree "dir" manually
-in order to have the zsh info files available to your info reader.
+To install the zsh info files (this must be done separately), do the
+command:
+    make install.info
+
+If the programme install-info is available, "make install.info" will
+insert an entry in the file "dir" in the same directory as the info
+files.  Otherwise you will have to edit the topmost node of the info
+tree "dir" manually in order to have the zsh info files available to
+your info reader.
 
 Building Zsh On Additional Architectures
 ----------------------------------------
--- Makefile.in.inst	Tue Nov 10 09:35:28 1998
+++ Makefile.in	Wed Jan 27 09:50:33 1999
@@ -55,9 +55,9 @@
 install-strip:
 	$(MAKE) install STRIPFLAGS="-s"
 
-# install/uninstall everything
-install: install.bin install.modules install.man install.info
-uninstall: uninstall.bin uninstall.modules uninstall.man uninstall.info
+# install/uninstall everything (except info)
+install: install.bin install.modules install.man
+uninstall: uninstall.bin uninstall.modules uninstall.man
 
 # install/uninstall just the binary
 install.bin uninstall.bin:

-- 
Peter Stephenson <pws@ibmth.df.unipi.it>       Tel: +39 050 844536
WWW:  http://www.ifh.de/~pws/
Dipartimento di Fisica, Via Buonarroti 2, 56127 Pisa, Italy

RE: PATCH: zsh-3.1.5-pws-5: creating info dir entry with install.info

[Andrej Borsenkow]

[-- Attachment #1: Type: text/plain, Size: 139 bytes --]

> 
> I get "malformed patch" when I try to apply this.  Did something rewrap
> some lines?
> 

Yep. Outlook.

Now attached. Sorry.

/andrej

[-- Attachment #2: zsh.texidir.patch --]
[-- Type: application/octet-stream, Size: 850 bytes --]

--- Doc/Makefile.in.org	Tue Nov 10 11:37:49 1998
+++ Doc/Makefile.in	Tue Jan 26 16:26:22 1999
@@ -141,6 +141,11 @@
 	  else :; \
 	   fi || exit 1; \
 	done
+	if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
+		install-info --dir-file=$(infodir)/dir $(infodir)/zsh.info; \
+	else true; fi
+
+
 
 install.html: zsh_toc.html
 	$(sdir_top)/mkinstalldirs $(htmldir)
--- Doc/ztexi.yo.org	Sat Sep 26 21:56:55 1998
+++ Doc/ztexi.yo	Tue Jan 26 16:24:33 1999
@@ -57,6 +57,12 @@
   NOTRANS(@iftex)NL()\
   NOTRANS(@set dsq '{}')NL()\
   NOTRANS(@end iftex)NL()\
+  NOTRANS(@ifinfo)NL()\
+  NOTRANS(@dircategory Utilities)NL()\
+  NOTRANS(@direntry)NL()\
+  NOTRANS(     * ZSH: (zsh).                     The Z Shell Guide.)NL()\
+  NOTRANS(@end direntry)NL()\
+  NOTRANS(@end ifinfo)NL()\
 )
 
 def(texiifinfo)(1)(\

Re: PATCH: zsh-3.1.5-pws-5: creating info dir entry with install.info

[Bart Schaefer]

On Jan 26,  4:47pm, Andrej Borsenkow wrote:
} Subject: PATCH: zsh-3.1.5-pws-5: creating info dir entry with install.info
}
} The patch below creates entry for ZSH in info dir file.

I get "malformed patch" when I try to apply this.  Did something rewrap
some lines?

-- 
Bart Schaefer                                 Brass Lantern Enterprises
http://www.well.com/user/barts              http://www.brasslantern.com

PATCH: zsh-3.1.5-pws-5: creating info dir entry with install.info

[Andrej Borsenkow]

The patch below creates entry for ZSH in info dir file. The item is created
in Utilities section, simply because it is, where bash is placed as well
(shells are to keep together :-) I was tempted to name item "The Ultimate
Shell" ... in any case, current name is simply placeholder.

The patch also updates ztexi.yo to add direntry to zsh.texi.

It works with install-info from the latest texinfo-3.12.

/andrej

--- Doc/Makefile.in.org Tue Nov 10 11:37:49 1998
+++ Doc/Makefile.in     Tue Jan 26 16:26:22 1999
@@ -141,6 +141,11 @@
          else :; \
           fi || exit 1; \
        done
+       if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
+               install-info --dir-file=$(infodir)/dir $(infodir)/zsh.info;
\
+       else true; fi
+
+

 install.html: zsh_toc.html
        $(sdir_top)/mkinstalldirs $(htmldir)
--- Doc/ztexi.yo.org    Sat Sep 26 21:56:55 1998
+++ Doc/ztexi.yo        Tue Jan 26 16:24:33 1999
@@ -57,6 +57,12 @@
   NOTRANS(@iftex)NL()\
   NOTRANS(@set dsq '{}')NL()\
   NOTRANS(@end iftex)NL()\
+  NOTRANS(@ifinfo)NL()\
+  NOTRANS(@dircategory Utilities)NL()\
+  NOTRANS(@direntry)NL()\
+  NOTRANS(     * ZSH: (zsh).                     The Z Shell Guide.)NL()\
+  NOTRANS(@end direntry)NL()\
+  NOTRANS(@end ifinfo)NL()\
 )

 def(texiifinfo)(1)(\