* [PATCH 1/2] Respect ./configure --htmldir, keeping our default @ 2009-05-25 14:02 Ingmar Vanhassel 2009-05-25 14:02 ` [PATCH 2/2] Install all html docs again Ingmar Vanhassel 2009-05-25 15:14 ` [PATCH 1/2] Respect ./configure --htmldir, keeping our default Bart Schaefer 0 siblings, 2 replies; 11+ messages in thread From: Ingmar Vanhassel @ 2009-05-25 14:02 UTC (permalink / raw) To: Zsh hackers list; +Cc: Ingmar Vanhassel --- Config/defs.mk.in | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/Config/defs.mk.in b/Config/defs.mk.in index 5195bf8..0377160 100644 --- a/Config/defs.mk.in +++ b/Config/defs.mk.in @@ -50,7 +50,10 @@ fndir = @fndir@ sitefndir = @sitefndir@ scriptdir = @scriptdir@ sitescriptdir = @sitescriptdir@ -htmldir = $(datadir)/$(tzsh)/htmldoc +htmldir := @htmldir@ +ifeq "$(htmldir)" "" +override htmldir := $(datadir)/$(tzsh)/htmldoc +endif # compilation CC = @CC@ -- 1.6.3.1 ^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 2/2] Install all html docs again 2009-05-25 14:02 [PATCH 1/2] Respect ./configure --htmldir, keeping our default Ingmar Vanhassel @ 2009-05-25 14:02 ` Ingmar Vanhassel 2009-05-25 15:14 ` [PATCH 1/2] Respect ./configure --htmldir, keeping our default Bart Schaefer 1 sibling, 0 replies; 11+ messages in thread From: Ingmar Vanhassel @ 2009-05-25 14:02 UTC (permalink / raw) To: Zsh hackers list; +Cc: Ingmar Vanhassel '26839: add --node-files option to texi2html' broke this. --- Doc/Makefile.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Doc/Makefile.in b/Doc/Makefile.in index c859c87..0b8cab5 100644 --- a/Doc/Makefile.in +++ b/Doc/Makefile.in @@ -332,14 +332,14 @@ uninstall.info: # install HTML manual install.html: html ${SHELL} $(sdir_top)/mkinstalldirs $(DESTDIR)$(htmldir) - for file in zsh*.html; do \ + for file in *.html; do \ $(INSTALL_DATA) $$file $(DESTDIR)$(htmldir) || exit 1; \ done .PHONY: install.html # uninstall HTML manual uninstall.html: - rm -f $(DESTDIR)$(htmldir)/zsh*.html + rm -f $(DESTDIR)$(htmldir)/*.html .PHONY: uninstall.html # ========== DEPENDENCIES FOR CLEANUP ========== -- 1.6.3.1 ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 1/2] Respect ./configure --htmldir, keeping our default 2009-05-25 14:02 [PATCH 1/2] Respect ./configure --htmldir, keeping our default Ingmar Vanhassel 2009-05-25 14:02 ` [PATCH 2/2] Install all html docs again Ingmar Vanhassel @ 2009-05-25 15:14 ` Bart Schaefer 2009-05-25 17:24 ` [PATCH] " Ingmar Vanhassel 2009-05-25 17:28 ` Ingmar Vanhassel 1 sibling, 2 replies; 11+ messages in thread From: Bart Schaefer @ 2009-05-25 15:14 UTC (permalink / raw) To: Ingmar Vanhassel, Zsh hackers list On May 25, 2:02pm, Ingmar Vanhassel wrote: } } +htmldir := @htmldir@ } +ifeq "$(htmldir)" "" } +override htmldir := $(datadir)/$(tzsh)/htmldoc } +endif I don't think we can assume GNU Make syntax. Yes, we assume configure and other GNU tools, but only for the developer who is building the tarball, not when running a "make" after extraction. ^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH] Respect ./configure --htmldir, keeping our default 2009-05-25 15:14 ` [PATCH 1/2] Respect ./configure --htmldir, keeping our default Bart Schaefer @ 2009-05-25 17:24 ` Ingmar Vanhassel 2009-05-25 17:31 ` Andrey Borzenkov 2009-05-25 17:28 ` Ingmar Vanhassel 1 sibling, 1 reply; 11+ messages in thread From: Ingmar Vanhassel @ 2009-05-25 17:24 UTC (permalink / raw) To: Zsh hackers list; +Cc: Ingmar Vanhassel Updated patch, without relying on GNU Make syntax. Apparently override doesn't do what I think it does, so it shouldn't've been there in the first place. --- Config/defs.mk.in | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/Config/defs.mk.in b/Config/defs.mk.in index 5195bf8..08f0ac4 100644 --- a/Config/defs.mk.in +++ b/Config/defs.mk.in @@ -50,7 +50,10 @@ fndir = @fndir@ sitefndir = @sitefndir@ scriptdir = @scriptdir@ sitescriptdir = @sitescriptdir@ -htmldir = $(datadir)/$(tzsh)/htmldoc +htmldir := @htmldir@ +ifeq "$(htmldir)" "" +htmldir = $(datadir)/$(tzsh)/htmldoc +endif # compilation CC = @CC@ -- 1.6.3.1 ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH] Respect ./configure --htmldir, keeping our default 2009-05-25 17:24 ` [PATCH] " Ingmar Vanhassel @ 2009-05-25 17:31 ` Andrey Borzenkov 2009-05-25 17:49 ` Ingmar Vanhassel 2009-05-25 18:06 ` Peter Stephenson 0 siblings, 2 replies; 11+ messages in thread From: Andrey Borzenkov @ 2009-05-25 17:31 UTC (permalink / raw) To: zsh-workers [-- Attachment #1: Type: Text/Plain, Size: 221 bytes --] On Monday 25 of May 2009 21:24:55 Ingmar Vanhassel wrote: > Updated patch, without relying on GNU Make syntax. [...] > +ifeq "$(htmldir)" "" > +htmldir = $(datadir)/$(tzsh)/htmldoc > +endif > But that *is* gmake syntax. [-- Attachment #2: This is a digitally signed message part. --] [-- Type: application/pgp-signature, Size: 197 bytes --] ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH] Respect ./configure --htmldir, keeping our default 2009-05-25 17:31 ` Andrey Borzenkov @ 2009-05-25 17:49 ` Ingmar Vanhassel 2009-05-25 18:06 ` Peter Stephenson 1 sibling, 0 replies; 11+ messages in thread From: Ingmar Vanhassel @ 2009-05-25 17:49 UTC (permalink / raw) To: zsh-workers On Mon, May 25, 2009 at 09:31:05PM +0400, Andrey Borzenkov wrote: > On Monday 25 of May 2009 21:24:55 Ingmar Vanhassel wrote: > > Updated patch, without relying on GNU Make syntax. > [...] > > +ifeq "$(htmldir)" "" > > +htmldir = $(datadir)/$(tzsh)/htmldoc > > +endif > > > > But that *is* gmake syntax. Bah, then I suppose I'll let someone who knows what they're doing fix it. -- Exherbo KDE, X.org maintainer ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH] Respect ./configure --htmldir, keeping our default 2009-05-25 17:31 ` Andrey Borzenkov 2009-05-25 17:49 ` Ingmar Vanhassel @ 2009-05-25 18:06 ` Peter Stephenson 2009-05-25 18:13 ` Clint Adams 1 sibling, 1 reply; 11+ messages in thread From: Peter Stephenson @ 2009-05-25 18:06 UTC (permalink / raw) To: zsh-workers Andrey Borzenkov wrote: > On Monday 25 of May 2009 21:24:55 Ingmar Vanhassel wrote: > > Updated patch, without relying on GNU Make syntax. > [...] > > +ifeq "$(htmldir)" "" > > +htmldir = $(datadir)/$(tzsh)/htmldoc > > +endif > > > > But that *is* gmake syntax. Indeed, we don't rely on "ifeq" or anything like it. But I'm not sure what's going on here anyway. Anything that needs to be configurable in the make system is either set by configure or if for some reason that's not appropriate is overridden using shell syntax. Should this be an option to configure? -- Peter Stephenson <p.w.stephenson@ntlworld.com> Web page now at http://homepage.ntlworld.com/p.w.stephenson/ ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH] Respect ./configure --htmldir, keeping our default 2009-05-25 18:06 ` Peter Stephenson @ 2009-05-25 18:13 ` Clint Adams 2009-05-26 9:25 ` Peter Stephenson 0 siblings, 1 reply; 11+ messages in thread From: Clint Adams @ 2009-05-25 18:13 UTC (permalink / raw) To: Peter Stephenson; +Cc: zsh-workers On Mon, May 25, 2009 at 07:06:29PM +0100, Peter Stephenson wrote: > But I'm not sure what's going on here anyway. Anything that needs to be > configurable in the make system is either set by configure or if for > some reason that's not appropriate is overridden using shell syntax. > Should this be an option to configure? Bump the AC_PREREQ to 2.59c and you should guarantee its existence. ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH] Respect ./configure --htmldir, keeping our default 2009-05-25 18:13 ` Clint Adams @ 2009-05-26 9:25 ` Peter Stephenson 2009-05-30 0:32 ` Ingmar Vanhassel 0 siblings, 1 reply; 11+ messages in thread From: Peter Stephenson @ 2009-05-26 9:25 UTC (permalink / raw) To: zsh-workers On Mon, 25 May 2009 18:13:49 +0000 Clint Adams <clint@zsh.org> wrote: > On Mon, May 25, 2009 at 07:06:29PM +0100, Peter Stephenson wrote: > > But I'm not sure what's going on here anyway. Anything that needs to be > > configurable in the make system is either set by configure or if for > > some reason that's not appropriate is overridden using shell syntax. > > Should this be an option to configure? > > Bump the AC_PREREQ to 2.59c and you should guarantee its existence. So the question is how we keep the same default but use any value on the command line. This tests whether the value is the configure default, which is a value you'd never give on the command line, but it's a bit brittle since the default can potentially change. I don't know how to second guess the standard argument processing; does anyone know? (This is a completely different problem from adding an argument not supported internally by autoconf.) Index: configure.ac =================================================================== RCS file: /cvsroot/zsh/zsh/configure.ac,v retrieving revision 1.124 diff -u -r1.124 configure.ac --- configure.ac 16 May 2009 12:13:00 -0000 1.124 +++ configure.ac 26 May 2009 09:19:49 -0000 @@ -26,7 +26,7 @@ dnl AC_INIT(Src/zsh.h) -AC_PREREQ(2.53b) +AC_PREREQ(2.59c) AC_CONFIG_HEADER(config.h) dnl What version of zsh are we building ? @@ -304,6 +304,12 @@ AC_SUBST(scriptdir)dnl AC_SUBST(sitescriptdir)dnl +dnl htmldir is already handled, but if it wasn't set, use +dnl the standard zsh default. +if test x$htmldir = x'${docdir}' || test x$htmldir = x; then + htmldir='$(datadir)/$(tzsh)/htmldoc' +fi + AH_TEMPLATE([CUSTOM_PATCHLEVEL], [Define to a custom value for the ZSH_PATCHLEVEL parameter]) AC_ARG_ENABLE(custom-patchlevel, Index: Config/defs.mk.in =================================================================== RCS file: /cvsroot/zsh/zsh/Config/defs.mk.in,v retrieving revision 1.14 diff -u -r1.14 defs.mk.in --- Config/defs.mk.in 13 Mar 2008 11:11:04 -0000 1.14 +++ Config/defs.mk.in 26 May 2009 09:19:49 -0000 @@ -50,7 +50,7 @@ sitefndir = @sitefndir@ scriptdir = @scriptdir@ sitescriptdir = @sitescriptdir@ -htmldir = $(datadir)/$(tzsh)/htmldoc +htmldir = @htmldir@ # compilation CC = @CC@ -- Peter Stephenson <pws@csr.com> Software Engineer CSR PLC, Churchill House, Cambridge Business Park, Cowley Road Cambridge, CB4 0WZ, UK Tel: +44 (0)1223 692070 ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH] Respect ./configure --htmldir, keeping our default 2009-05-26 9:25 ` Peter Stephenson @ 2009-05-30 0:32 ` Ingmar Vanhassel 0 siblings, 0 replies; 11+ messages in thread From: Ingmar Vanhassel @ 2009-05-30 0:32 UTC (permalink / raw) To: zsh-workers On Tue, May 26, 2009 at 10:25:57AM +0100, Peter Stephenson wrote: > On Mon, 25 May 2009 18:13:49 +0000 > So the question is how we keep the same default but use any value on the > command line. This tests whether the value is the configure default, which > is a value you'd never give on the command line, but it's a bit brittle > since the default can potentially change. I don't know how to second guess > the standard argument processing; does anyone know? (This is a completely > different problem from adding an argument not supported internally by > autoconf.) That works like what I was aiming for, thanks Peter! -- Exherbo KDE, X.org maintainer ^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH] Respect ./configure --htmldir, keeping our default 2009-05-25 15:14 ` [PATCH 1/2] Respect ./configure --htmldir, keeping our default Bart Schaefer 2009-05-25 17:24 ` [PATCH] " Ingmar Vanhassel @ 2009-05-25 17:28 ` Ingmar Vanhassel 1 sibling, 0 replies; 11+ messages in thread From: Ingmar Vanhassel @ 2009-05-25 17:28 UTC (permalink / raw) To: Zsh hackers list; +Cc: Ingmar Vanhassel [Resend, fixed another thinko] Updated patch, without relying on GNU Make syntax. Apparently override doesn't do what I think it does, so it shouldn't've been there in the first place. --- Config/defs.mk.in | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/Config/defs.mk.in b/Config/defs.mk.in index 5195bf8..81c1edd 100644 --- a/Config/defs.mk.in +++ b/Config/defs.mk.in @@ -50,7 +50,10 @@ fndir = @fndir@ sitefndir = @sitefndir@ scriptdir = @scriptdir@ sitescriptdir = @sitescriptdir@ -htmldir = $(datadir)/$(tzsh)/htmldoc +htmldir = @htmldir@ +ifeq "$(htmldir)" "" +htmldir = $(datadir)/$(tzsh)/htmldoc +endif # compilation CC = @CC@ -- 1.6.3.1 ^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2009-05-30 0:32 UTC | newest] Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2009-05-25 14:02 [PATCH 1/2] Respect ./configure --htmldir, keeping our default Ingmar Vanhassel 2009-05-25 14:02 ` [PATCH 2/2] Install all html docs again Ingmar Vanhassel 2009-05-25 15:14 ` [PATCH 1/2] Respect ./configure --htmldir, keeping our default Bart Schaefer 2009-05-25 17:24 ` [PATCH] " Ingmar Vanhassel 2009-05-25 17:31 ` Andrey Borzenkov 2009-05-25 17:49 ` Ingmar Vanhassel 2009-05-25 18:06 ` Peter Stephenson 2009-05-25 18:13 ` Clint Adams 2009-05-26 9:25 ` Peter Stephenson 2009-05-30 0:32 ` Ingmar Vanhassel 2009-05-25 17:28 ` Ingmar Vanhassel
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).