Skip to content

Commit b9d95fd

Browse files
committed
fix(build): Don't distribute distfiles list with configure option specific output
This was preventing --with[out]-system-luarocks from properly figuring out what to install when used from source distributions because it thought it knew already.
1 parent f634a60 commit b9d95fd

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

Makefile.am

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ TESTPREVIEWS ?= $(addsuffix .pdf,$(basename $(filter-out $(_DISABLEDSRCS),$(_TES
4040
# using $(wildcard ...) to include it (the very function we couldn't use because
4141
# of the race condition it creates) we actually keep it from being flattened and
4242
# hence evaluated when we want it to be. Since the file always exists (see
43-
# BUILT_SOURCES and EXTRA_DIST) this doesn't induce a race.
43+
# BUILT_SOURCES) this doesn't induce a race.
4444
include $(wildcard Makefile-distfiles)
4545

4646
FIGURES = documentation/fig-input-to-output.pdf
@@ -69,7 +69,6 @@ dist_doc_DATA = README.md CHANGELOG.md
6969
dist_pdf_DATA = $(_MANUAL)
7070
dist_license_DATA = LICENSE.md
7171
EXTRA_DIST = spec tests documentation sile-dev-1.rockspec fontconfig.conf
72-
EXTRA_DIST += Makefile-distfiles
7372
EXTRA_DIST += build-aux/action-updater.js build-aux/cargo-updater.js build-aux/config.ld build-aux/decore-automake.sh build-aux/git-version-gen build-aux/list-dist-files.sh
7473
EXTRA_DIST += Dockerfile build-aux/docker-bootstrap.sh build-aux/docker-fontconfig.conf hooks/build
7574
EXTRA_DIST += default.nix flake.nix flake.lock shell.nix build-aux/pkg.nix
@@ -177,7 +176,6 @@ dist-hook-decore-automake:
177176
.PHONY: dist-hook-devendor-luarocks
178177
dist-hook-devendor-luarocks: dist-hook-decore-automake
179178
cd $(distdir)
180-
$(SED) -i -e '/^LUAMODULES =/s/=.*/=/' Makefile-distfiles
181179
$(SED) -i -e '/^LUAMODULES/d;/^\tlua_modules/d' Makefile.in
182180

183181
# Whether to force tests to run from scratch

0 commit comments

Comments
 (0)