zsh-workers
 help / color / mirror / code / Atom feed
* PATCH: zsh-3.1.6-dev-17: Doc/Makefile.in rule: Zsh/modlist.yo
@ 2000-02-06  6:38 Geoff Wing
  2000-02-06  8:03 ` Tanaka Akira
  2000-02-06 19:48 ` Bart Schaefer
  0 siblings, 2 replies; 5+ messages in thread
From: Geoff Wing @ 2000-02-06  6:38 UTC (permalink / raw)
  To: zsh-workers

Heyla,
here's a patch for building Zsh/modlist.yo.  It subdues some temperamental
sh variants (namely mine) over ``unset'' and for some reason the test was
failing but it works when reversed.  Note also that I've removed the
CTRL-A's from the includefile() lines: any reason they were there?

Regards,
Geoff

*** Doc/Makefile.in.~1~	Mon Jan 31 07:52:30 2000
--- Doc/Makefile.in	Sun Feb  6 17:29:57 2000
***************
*** 178,195 ****
  		echo ")"; \
  	    done; \
  	    echo "enditem()"; \
! 	    echo "includefile(Zsh/modmenu.yo)\x01"; \
  	    set '' $(MODDOCSRC); \
! 	    unset mod1 mod2 mod3; \
! 	    test ".$$2" != . && \
  		mod2=`sed -n '1{s|^COMMENT(!MOD!||;p;q;}' < $(sdir)/$$2`; \
  	    while test ".$$2" != .; do \
! 		unset mod3; \
! 		test ".$$3" != . && \
  		    mod3=`sed -n '1{s|^COMMENT(!MOD!||;p;q;}' < $(sdir)/$$3`; \
  		echo "texinode(The $$mod2 Module)($${mod3+The $$mod3 Module})($${mod1:+The $$mod1 Module})(Zsh Modules)"; \
  		echo "sect(The $$mod2 Module)"; \
! 		echo "includefile($${2})\x01"; \
  		shift; \
  		mod1=$$mod2; \
  		mod2=$$mod3; \
--- 178,195 ----
  		echo ")"; \
  	    done; \
  	    echo "enditem()"; \
! 	    echo "includefile(Zsh/modmenu.yo)"; \
  	    set '' $(MODDOCSRC); \
! 	    unset mod1 mod2 mod3 || true; \
! 	    test ".$$2" = . || \
  		mod2=`sed -n '1{s|^COMMENT(!MOD!||;p;q;}' < $(sdir)/$$2`; \
  	    while test ".$$2" != .; do \
! 		unset mod3 || true; \
! 		test ".$$3" = . || \
  		    mod3=`sed -n '1{s|^COMMENT(!MOD!||;p;q;}' < $(sdir)/$$3`; \
  		echo "texinode(The $$mod2 Module)($${mod3+The $$mod3 Module})($${mod1:+The $$mod1 Module})(Zsh Modules)"; \
  		echo "sect(The $$mod2 Module)"; \
! 		echo "includefile($${2})"; \
  		shift; \
  		mod1=$$mod2; \
  		mod2=$$mod3; \

-- 
Geoff Wing : <gcw@pobox.com>     Work URL: http://www.primenet.com.au/
Rxvt Stuff : <gcw@rxvt.org>      Ego URL : http://pobox.com/~gcw/
Zsh Stuff  : <gcw@zsh.org>       Phone   : (Australia) 0413 431 874


^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: PATCH: zsh-3.1.6-dev-17: Doc/Makefile.in rule: Zsh/modlist.yo
  2000-02-06  6:38 PATCH: zsh-3.1.6-dev-17: Doc/Makefile.in rule: Zsh/modlist.yo Geoff Wing
@ 2000-02-06  8:03 ` Tanaka Akira
  2000-02-06 19:48 ` Bart Schaefer
  1 sibling, 0 replies; 5+ messages in thread
From: Tanaka Akira @ 2000-02-06  8:03 UTC (permalink / raw)
  To: zsh-workers

In article <slrn89q5ne.l7g.mason@coral.primenet.com.au>,
  mason@primenet.com.au (Geoff Wing) writes:

> here's a patch for building Zsh/modlist.yo.  It subdues some temperamental
> sh variants (namely mine) over ``unset'' and for some reason the test was
> failing but it works when reversed.  Note also that I've removed the
> CTRL-A's from the includefile() lines: any reason they were there?

I think suspicious `|| true' should be removed.  Although it is
required because BSD make calls /bin/sh with -e, assigning empty
string works well without it.

Index: Doc/Makefile.in
===================================================================
RCS file: /projects/zsh/zsh/Doc/Makefile.in,v
retrieving revision 1.1.1.58
diff -u -r1.1.1.58 Makefile.in
--- Doc/Makefile.in	2000/02/06 06:40:38	1.1.1.58
+++ Doc/Makefile.in	2000/02/06 07:45:17
@@ -180,14 +180,14 @@
 	    echo "enditem()"; \
 	    echo "includefile(Zsh/modmenu.yo)"; \
 	    set '' $(MODDOCSRC); \
-	    unset mod1 mod2 mod3 || true; \
+	    mod1= mod2= mod3=; \
 	    test ".$$2" = . || \
 		mod2=`sed -n '1{s|^COMMENT(!MOD!||;p;q;}' < $(sdir)/$$2`; \
 	    while test ".$$2" != .; do \
-		unset mod3 || true; \
+		mod3=; \
 		test ".$$3" = . || \
 		    mod3=`sed -n '1{s|^COMMENT(!MOD!||;p;q;}' < $(sdir)/$$3`; \
-		echo "texinode(The $$mod2 Module)($${mod3+The $$mod3 Module})($${mod1:+The $$mod1 Module})(Zsh Modules)"; \
+		echo "texinode(The $$mod2 Module)($${mod3:+The $$mod3 Module})($${mod1:+The $$mod1 Module})(Zsh Modules)"; \
 		echo "sect(The $$mod2 Module)"; \
 		echo "includefile($${2})"; \
 		shift; \
-- 
Tanaka Akira


^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: PATCH: zsh-3.1.6-dev-17: Doc/Makefile.in rule: Zsh/modlist.yo
  2000-02-06  6:38 PATCH: zsh-3.1.6-dev-17: Doc/Makefile.in rule: Zsh/modlist.yo Geoff Wing
  2000-02-06  8:03 ` Tanaka Akira
@ 2000-02-06 19:48 ` Bart Schaefer
  2000-02-06 23:38   ` Geoff Wing
  1 sibling, 1 reply; 5+ messages in thread
From: Bart Schaefer @ 2000-02-06 19:48 UTC (permalink / raw)
  To: mason, zsh-workers

On Feb 6,  6:38am, Geoff Wing wrote:
} Subject: PATCH: zsh-3.1.6-dev-17: Doc/Makefile.in rule: Zsh/modlist.yo
}
} Note also that I've removed the
} CTRL-A's from the includefile() lines: any reason they were there?

I think they were to work around a bug in some version of yodl or other.
There should be some discussion in the archives about it.

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


^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: PATCH: zsh-3.1.6-dev-17: Doc/Makefile.in rule: Zsh/modlist.yo
  2000-02-06 19:48 ` Bart Schaefer
@ 2000-02-06 23:38   ` Geoff Wing
  2000-02-07  0:11     ` Bart Schaefer
  0 siblings, 1 reply; 5+ messages in thread
From: Geoff Wing @ 2000-02-06 23:38 UTC (permalink / raw)
  To: zsh-workers

Bart Schaefer <schaefer@candle.brasslantern.com> typed:
:On Feb 6,  6:38am, Geoff Wing wrote:
:} Note also that I've removed the
:} CTRL-A's from the includefile() lines: any reason they were there?
:I think they were to work around a bug in some version of yodl or other.
:There should be some discussion in the archives about it.

OK, couldn't find anything about it but this puts them back in.
Follows my message 9584 &  Tanaka's 9585


--- Doc/Makefile.in.org	Mon Feb  7 10:34:29 2000
+++ Doc/Makefile.in	Mon Feb  7 10:35:06 2000
@@ -178,7 +178,7 @@
 		echo ")"; \
 	    done; \
 	    echo "enditem()"; \
-	    echo "includefile(Zsh/modmenu.yo)"; \
+	    echo "includefile(Zsh/modmenu.yo)\x01"; \
 	    set '' $(MODDOCSRC); \
 	    mod1= mod2= mod3=; \
 	    test ".$$2" = . || \
@@ -189,7 +189,7 @@
 		    mod3=`sed -n '1{s|^COMMENT(!MOD!||;p;q;}' < $(sdir)/$$3`; \
 		echo "texinode(The $$mod2 Module)($${mod3:+The $$mod3 Module})($${mod1:+The $$mod1 Module})(Zsh Modules)"; \
 		echo "sect(The $$mod2 Module)"; \
-		echo "includefile($${2})"; \
+		echo "includefile($${2})\x01"; \
 		shift; \
 		mod1=$$mod2; \
 		mod2=$$mod3; \
-- 
Geoff Wing : <gcw@pobox.com>     Work URL: http://www.primenet.com.au/
Rxvt Stuff : <gcw@rxvt.org>      Ego URL : http://pobox.com/~gcw/
Zsh Stuff  : <gcw@zsh.org>       Phone   : (Australia) 0413 431 874


^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: PATCH: zsh-3.1.6-dev-17: Doc/Makefile.in rule: Zsh/modlist.yo
  2000-02-06 23:38   ` Geoff Wing
@ 2000-02-07  0:11     ` Bart Schaefer
  0 siblings, 0 replies; 5+ messages in thread
From: Bart Schaefer @ 2000-02-07  0:11 UTC (permalink / raw)
  To: zsh-workers

On Feb 6, 11:38pm, Geoff Wing wrote:
} Subject: Re: PATCH: zsh-3.1.6-dev-17: Doc/Makefile.in rule: Zsh/modlist.yo
}
} Bart Schaefer <schaefer@candle.brasslantern.com> typed:
} :On Feb 6,  6:38am, Geoff Wing wrote:
} :} Note also that I've removed the
} :} CTRL-A's from the includefile() lines: any reason they were there?
} :I think they were to work around a bug in some version of yodl or other.
} :There should be some discussion in the archives about it.
} 
} OK, couldn't find anything about it

Article 4041.

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


^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2000-02-07  0:11 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2000-02-06  6:38 PATCH: zsh-3.1.6-dev-17: Doc/Makefile.in rule: Zsh/modlist.yo Geoff Wing
2000-02-06  8:03 ` Tanaka Akira
2000-02-06 19:48 ` Bart Schaefer
2000-02-06 23:38   ` Geoff Wing
2000-02-07  0:11     ` Bart Schaefer

Code repositories for project(s) associated with this public inbox

	https://git.vuxu.org/mirror/zsh/

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).