GNU bug report logs - #70904
[PATCH] Don't ship nested duplicates of web assets; no $(wildcard ...).

Previous Next

To reply to this bug, email your comments to 70904 AT debbugs.gnu.org.
There is no need to reopen the bug first.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Felix Lechner <felix.lechner <at> lease-up.com>
To: bug-mumi <at> gnu.org
Cc: Felix Lechner <felix.lechner <at> lease-up.com>
Subject: [PATCH] Don't ship nested duplicates of web assets;
 no $(wildcard ...).
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

Message #8 received at 70904 <at> debbugs.gnu.org (full text, mbox):

From: Felix Lechner <felix.lechner <at> lease-up.com>
To: 70904 <at> debbugs.gnu.org
Subject: Preview available
Date: Sun, 12 May 2024 21:45:11 -0700

A preview of this code is live at patchwise.org.

Message #13 received at 70904-done <at> debbugs.gnu.org (full text, mbox):

From: Arun Isaac <arunisaac <at> systemreboot.net>
To: 70904-done <at> debbugs.gnu.org
Cc: Felix Lechner <felix.lechner <at> lease-up.com>
Subject: Re: [PATCH] Don't ship nested duplicates of web assets; no
 $(wildcard ...).
Date: Fri, 14 Mar 2025 15:27:55 +0000

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

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.