Subject: [PATCH] Don't ship nested duplicates of web assets; no $(wildcard ...).

From: Felix Lechner <[email-masked]>
Date: Sun, 12 May 2024 21:19:05 -0700

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