Re: [PATCHv2/RFC] gitweb: Prepare for splitting gitweb
flat view
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:49:05
Jakub Narebski [off-list ref] writes:
quoted hunk
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)? I also suspect that your assignment to "install_dirs" is completely bogus when the files listed in GITWEB_MODULES span multiple directories.