From: Felix Lechner via Bug-mumi via "Bug reports for GNU Guix Mumi." <bug-mumi@gnu.org>
To: 70904@debbugs.gnu.org
Cc: Felix Lechner <felix.lechner@lease-up.com>
Subject: bug#70904: [PATCH] Don't ship nested duplicates of web assets; no $(wildcard ...).
Date: Sun, 12 May 2024 21:19:05 -0700 [thread overview]
Message-ID: <20240513041905.4777-1-felix.lechner@lease-up.com> (raw)
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
next reply other threads:[~2024-05-13 4:43 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-13 4:19 Felix Lechner via Bug-mumi via Bug reports for GNU Guix Mumi. [this message]
2024-05-13 4:45 ` bug#70904: Preview available Felix Lechner via Bug-mumi via Bug reports for GNU Guix Mumi.
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://issues.guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240513041905.4777-1-felix.lechner@lease-up.com \
--to=bug-mumi@gnu.org \
--cc=70904@debbugs.gnu.org \
--cc=felix.lechner@lease-up.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).