Skip to content

Commit

Permalink
fix(build): Don't distribute distfiles list with configure option spe…
Browse files Browse the repository at this point in the history
…cific 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.
  • Loading branch information
alerque committed Jun 27, 2024
1 parent f634a60 commit b9d95fd
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 40,7 @@ TESTPREVIEWS ?= $(addsuffix .pdf,$(basename $(filter-out $(_DISABLEDSRCS),$(_TES
# using $(wildcard ...) to include it (the very function we couldn't use because
# of the race condition it creates) we actually keep it from being flattened and
# hence evaluated when we want it to be. Since the file always exists (see
# BUILT_SOURCES and EXTRA_DIST) this doesn't induce a race.
# BUILT_SOURCES) this doesn't induce a race.
include $(wildcard Makefile-distfiles)

FIGURES = documentation/fig-input-to-output.pdf
Expand Down Expand Up @@ -69,7 69,6 @@ dist_doc_DATA = README.md CHANGELOG.md
dist_pdf_DATA = $(_MANUAL)
dist_license_DATA = LICENSE.md
EXTRA_DIST = spec tests documentation sile-dev-1.rockspec fontconfig.conf
EXTRA_DIST = Makefile-distfiles
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
EXTRA_DIST = Dockerfile build-aux/docker-bootstrap.sh build-aux/docker-fontconfig.conf hooks/build
EXTRA_DIST = default.nix flake.nix flake.lock shell.nix build-aux/pkg.nix
Expand Down Expand Up @@ -177,7 176,6 @@ dist-hook-decore-automake:
.PHONY: dist-hook-devendor-luarocks
dist-hook-devendor-luarocks: dist-hook-decore-automake
cd $(distdir)
$(SED) -i -e '/^LUAMODULES =/s/=.*/=/' Makefile-distfiles
$(SED) -i -e '/^LUAMODULES/d;/^\tlua_modules/d' Makefile.in

# Whether to force tests to run from scratch
Expand Down

0 comments on commit b9d95fd

Please sign in to comment.