On Wed, 7 Jul 2010, Junio C Hamano wrote:
> Jakub Narebski <jnareb@xxxxxxxxx> writes:
>
> > diff --git a/gitweb/Makefile b/gitweb/Makefile
> > index 2fb7c2d..84a1d71 100644
> > --- a/gitweb/Makefile
> > +++ b/gitweb/Makefile
> > @@ -145,12 +146,23 @@ gitweb.cgi: gitweb.perl GITWEB-BUILD-OPTIONS
> >
> > ### Installation rules
> >
> > -install: all
> > +install: all install-modules
> > $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(gitwebdir_SQ)'
> > $(INSTALL) -m 755 $(GITWEB_PROGRAMS) '$(DESTDIR_SQ)$(gitwebdir_SQ)'
> > $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(gitwebstaticdir_SQ)'
> > $(INSTALL) -m 644 $(GITWEB_FILES) '$(DESTDIR_SQ)$(gitwebstaticdir_SQ)'
> >
> > +install-modules:
> > + install_dirs=$(sort $(dir $(GITWEB_MODULES))) && \
> > + for dir in $$install_dirs; do \
> > + test -d '$(DESTDIR_SQ)$(gitwebdir_SQ)/$$dir' || \
> > + $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(gitwebdir_SQ)/$$dir'; \
> > + done
> > + gitweb_modules=$(GITWEB_MODULES) && \
> > + for mod in $$gitweb_modules; do \
> > + $(INSTALL) -m 644 $$mod '$(DESTDIR_SQ)$(gitwebdir_SQ)/$$(dirname $$mod)'; \
> > + done
> > +
>
> Sorry, but you lost me here. Where is GITWEB_MODULES defined (iow, what
> commit is this patch supposed to be applied)?
This is preparatory patch either for Pavan GSoC2010 work on splitting
gitweb and adding committool / admin write capabilities, or for mine
gitweb caching series split into modules (based on J.H. patch for
git.kernel.org).
So currently $(GITWEB_MODULES) is not defined / empty.
> I also suspect that your assignment to "install_dirs" is completely bogus
> when the files listed in GITWEB_MODULES span multiple directories.
install_dirs contains _list_ of directories gitweb modules are to be
installed into. `$(dir NAMES...)' extracts the directory-part of each
file name in NAMES ('./' if there is no '/' in a file name), and
`$(sort LIST)' is used to remove duplicate words in LIST.
It was actually tested that it works for modularized gitweb caching,
in the older form using `$(foreach ...)' rather than current shell
'for' loop.
For example with the following Makefile:
GITWEB_MODULES += GitwebCache/SimpleFileCache.pm
GITWEB_MODULES += GitwebCache/Capture.pm
GITWEB_MODULES += GitwebCache/Capture/SelectFH.pm
GITWEB_MODULES += Gitweb/Config.pm
all:
@echo $(sort $(dir $(GITWEB_MODULES)))
running 'make' results in:
Gitweb/ GitwebCache/ GitwebCache/Capture/
--
Jakub Narebski
Poland
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html