GNU bug report logs -
#70904
[PATCH] Don't ship nested duplicates of web assets; no $(wildcard ...).
Previous Next
Full log
View this message in rfc822 format
[Message part 1 (text/plain, inline)]
Your message dated Fri, 14 Mar 2025 15:27:55 +0000
with message-id <875xkbmy2s.fsf <at> systemreboot.net>
and subject line Re: [PATCH] Don't ship nested duplicates of web assets; no $(wildcard ...).
has caused the debbugs.gnu.org bug report #70904,
regarding [PATCH] Don't ship nested duplicates of web assets; no $(wildcard ...).
to be marked as done.
(If you believe you have received this mail in error, please contact
help-debbugs <at> gnu.org.)
--
70904: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=70904
GNU Bug Tracking System
Contact help-debbugs <at> gnu.org with problems
[Message part 2 (message/rfc822, inline)]
This was possibly the result of an incorrect understanding of Automake
variable prefixes like "base".
Also, Automake does not support wildcards:
https://www.gnu.org/software/automake/manual/html_node/Wildcards.html
---
Makefile.am | 25 +++++++++++++------------
1 file changed, 13 insertions(+), 12 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 3e57e63..70f7f85 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,15 +24,6 @@ bin_SCRIPTS = \
moddir = $(prefix)/share/guile/site/$(GUILE_EFFECTIVE_VERSION)
godir = $(libdir)/guile/$(GUILE_EFFECTIVE_VERSION)/site-ccache
-assetsdir = $(pkgdatadir)/assets
-assetscssdir = $(assetsdir)/css
-assetsimgdir = $(assetsdir)/img
-assetsjsdir = $(assetsdir)/js
-
-assetscss_DATA = $(wildcard assets/css/*)
-assetsimg_DATA = $(wildcard assets/img/*)
-assetsjs_DATA = $(wildcard assets/js/*)
-
dist_pkgdata_DATA = etc/schema.sql
SOURCES = \
@@ -80,9 +71,19 @@ PICO_SCSS = $(wildcard assets/pico/scss/*.scss)
assets/css/mumi.css: assets/mumi.scss assets/_theme-switcher.scss $(PICO_SCSS)
$(SASSC) $< $@
-nobase_dist_assets_DATA = \
- assets/css/mumi.css \
- $(assetsjs_DATA) $(assetsimg_DATA)
+nobase_nodist_pkgdata_DATA = \
+ assets/css/mumi.css
+
+nobase_dist_pkgdata_DATA = \
+ assets/css/reset.css \
+ assets/css/screen.css \
+ assets/img/file.svg \
+ assets/img/logo.png \
+ assets/img/spin.gif \
+ assets/js/mumi.js \
+ assets/js/sort-table.js \
+ assets/js/theme-switcher.js \
+ assets/js/tokeninput.js
EXTRA_DIST += \
pre-inst-env.in \
base-commit: 99416ed5c7d950eaf54d52023a2efd975bccac92
--
2.41.0
[Message part 3 (message/rfc822, inline)]
Hi Felix,
Thank you, that was very helpful! I've pushed with minor tweaks.
https://git.savannah.gnu.org/cgit/guix/mumi.git/commit/?id=587c00e6b666730706b2162a71b881224511c106
Regards,
Arun
This bug report was last modified 123 days ago.
Previous Next
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.