Hi,
the new gitweb.js build (moved into a shell script) now
appends said shell script to the end of the gitweb.js
that’s actually installed, causing js syntax errors and
no small amount of confusion.
This is because (rightfully) the output got a new dependency…
> $(MAK_DIR_GITWEB)static/gitweb.js: $(MAK_DIR_GITWEB)generate-gitweb-js.sh
… but the rule uses $^ to append sources.
Possible fix attached.
bye,
//mirabilos
--
<ch> you introduced a merge commit │<mika> % g rebase -i HEAD^^
<mika> sorry, no idea and rebasing just fscked │<mika> Segmentation
<ch> should have cloned into a clean repo │ fault (core dumped)
<ch> if I rebase that now, it's really ugh │<mika:#grml> wuahhhhhh
From ed9863971d37ed53628a5871a4a569ccd6287f53 Mon Sep 17 00:00:00 2001
From: mirabilos <tg@xxxxxxxxxx>
Date: Fri, 28 Feb 2025 05:33:10 +0000
Subject: [PATCH] Unbreak content of gitweb.js
The former $^ adds all prerequisites, including the
(proper) new dependency on the generator script.
Signed-off-by: mirabilos <tg@xxxxxxxxxx>
---
gitweb/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gitweb/Makefile b/gitweb/Makefile
index d5748e9359..2a8f97cef8 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 $@+ $(addprefix $(MAK_DIR_GITWEB),$(GITWEB_JSLIB_FILES)) && \
mv $@+ $@
### Installation rules
--
2.30.2
