* bug#70904: [PATCH] Don't ship nested duplicates of web assets; no $(wildcard ...).
@ 2024-05-13 4:19 Felix Lechner via Bug-mumi via Bug reports for GNU Guix Mumi.
2024-05-13 4:45 ` bug#70904: Preview available Felix Lechner via Bug-mumi via Bug reports for GNU Guix Mumi.
0 siblings, 1 reply; 2+ messages in thread
From: Felix Lechner via Bug-mumi via Bug reports for GNU Guix Mumi. @ 2024-05-13 4:19 UTC (permalink / raw)
To: 70904; +Cc: Felix Lechner
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* bug#70904: Preview available
2024-05-13 4:19 bug#70904: [PATCH] Don't ship nested duplicates of web assets; no $(wildcard ...) Felix Lechner via Bug-mumi via Bug reports for GNU Guix Mumi.
@ 2024-05-13 4:45 ` Felix Lechner via Bug-mumi via Bug reports for GNU Guix Mumi.
0 siblings, 0 replies; 2+ messages in thread
From: Felix Lechner via Bug-mumi via Bug reports for GNU Guix Mumi. @ 2024-05-13 4:45 UTC (permalink / raw)
To: 70904
A preview of this code is live at patchwise.org.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-05-13 4:46 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-05-13 4:19 bug#70904: [PATCH] Don't ship nested duplicates of web assets; no $(wildcard ...) Felix Lechner via Bug-mumi via Bug reports for GNU Guix Mumi.
2024-05-13 4:45 ` bug#70904: Preview available Felix Lechner via Bug-mumi via Bug reports for GNU Guix Mumi.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).