Skip to content

Commit c0d3f90

Browse files
pks-tgitster
authored andcommitted
gitweb: fix generation of "gitweb.js"
In 19d8fe7 (Makefile: extract script to generate gitweb.js, 2024-12-06) we have extracted the logic to build "gitweb.js" into a separate script. As part of that the rules that builds the script has gained a new dependency on that script. This refactoring is broken though because we use "$^" to determine the set of JavaScript files that need to be concatenated, and this implicit variable now also contains the build script itself. As a result, the build script ends up ni the generated "gitweb.js" file, which is wrong. Fix the issue by filtering out non-JavaScript files. Based-on-patch-by: Thorsten Glaser <[email protected]> Signed-off-by: Patrick Steinhardt <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 5a69234 commit c0d3f90

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

gitweb/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ $(MAK_DIR_GITWEB)gitweb.cgi: $(MAK_DIR_GITWEB)gitweb.perl
118118
$(MAK_DIR_GITWEB)static/gitweb.js: $(MAK_DIR_GITWEB)generate-gitweb-js.sh
119119
$(MAK_DIR_GITWEB)static/gitweb.js: $(addprefix $(MAK_DIR_GITWEB),$(GITWEB_JSLIB_FILES))
120120
$(QUIET_GEN)$(RM) $@ $@+ && \
121-
$(MAK_DIR_GITWEB)generate-gitweb-js.sh $@+ $^ && \
121+
$(MAK_DIR_GITWEB)generate-gitweb-js.sh $@+ $(filter %.js,$^) && \
122122
mv $@+ $@
123123

124124
### Installation rules

0 commit comments

Comments
 (0)