diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-04-16 13:54:18 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-04-16 13:54:18 -0700 |
| commit | 7cfdb0abc60372fb28c25566623334fe86c365d1 (patch) | |
| tree | 5e2f3a63bfed464853f20a5bda6f81300539f7fd /gitweb/Makefile | |
| parent | 779534d5a7ee08f7af3a7bc038b68359fd59f578 (diff) | |
| parent | 85e1d6819fbc32059d0170cfbfe7c1989f3753e8 (diff) | |
Merge branch 'ps/misc-build-fixes'
Random build fixes.
* ps/misc-build-fixes:
ci: use Visual Studio for win+meson job on GitHub Workflows
meson: distinguish build and target host binaries
meson: respect 'tests' build option in contrib
gitweb: fix generation of "gitweb.js"
meson: fix handling of '-Dcurl=auto'
Diffstat (limited to 'gitweb/Makefile')
| -rw-r--r-- | gitweb/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gitweb/Makefile b/gitweb/Makefile index d5748e9359..26a683d442 100644 --- a/gitweb/Makefile +++ b/gitweb/Makefile @@ -118,7 +118,7 @@ $(MAK_DIR_GITWEB)gitweb.cgi: $(MAK_DIR_GITWEB)gitweb.perl $(MAK_DIR_GITWEB)static/gitweb.js: $(MAK_DIR_GITWEB)generate-gitweb-js.sh $(MAK_DIR_GITWEB)static/gitweb.js: $(addprefix $(MAK_DIR_GITWEB),$(GITWEB_JSLIB_FILES)) $(QUIET_GEN)$(RM) $@ $@+ && \ - $(MAK_DIR_GITWEB)generate-gitweb-js.sh $@+ $^ && \ + $(MAK_DIR_GITWEB)generate-gitweb-js.sh $@+ $(filter %.js,$^) && \ mv $@+ $@ ### Installation rules |