Re: [PATCHv2 00/11] gitweb: Change timezone in dates using JavaScript
Show 15 quoted lines
> Junio C Hamano wrote:
>
> > This seems to break the build like this, by exposing a lack of dependency
> > somewhere in the Makefile:
> >
> > ...
> > SUBDIR gitweb
> > make: *** No rule to make target `gitweb/static/gitweb.js', needed by `git-instaweb'. Stop.
> > make: *** Waiting for unfinished jobs....
> >
>
> Ah, thanks for report. and sorry for the bug.
>
> This bug is caused by the fact that main Makefile doesn't know (as it should)
> that gitweb.js is now generated file.
Perhaps something like that would be a good change, what do you think?
-- >8 --
diff --git i/Makefile w/Makefile
index cbc3fce..8960cee 100644
--- i/Makefile
+++ w/Makefile
@@ -1773,7 +1773,7 @@ gitweb/static/gitweb.min.css: gitweb/static/gitweb.css
endif # CSSMIN
-git-instaweb: git-instaweb.sh gitweb/gitweb.cgi gitweb/static/gitweb.css gitweb/static/gitweb.js
+git-instaweb: git-instaweb.sh gitweb
$(QUIET_GEN)$(RM) $@ $@+ && \
sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
-e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \