Skip to content

Commit dae2f7f

Browse files
committed
fix(build): Correct regression in v0.15.5 in generating embedded files list
1 parent 1e162f6 commit dae2f7f

2 files changed

Lines changed: 4 additions & 3 deletions

File tree

Makefile.am

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,9 @@ endif !EMBEDDED_RESOURCES
136136

137137
src/embed-includes.rs: Makefile-distfiles
138138
{
139-
echo $(BUILT_LUA_SOURCES)
140-
$(GREP) -E '^(SILEDATA|LUALIBRARIES|LUAMODULES) = ' $<
139+
echo $(BUILT_SOURCES_LUA)
140+
$(SED) -ze 's/\\\n\t//g' $< |
141+
$(GREP) -E '^(SILEDATA|LUALIBRARIES|LUAMODULES) = '
141142
} |
142143
$(SED) -E -e 's/^.* = //;s/ /\n/g' |
143144
while read file; do

build-aux/que_rust_boilerplate.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ $(COMPLETIONS_OUT_DIR)/_$(TRANSFORMED_PACKAGE_NAME).ps1: $(CARGO_BIN) | $(COMPLE
5454
$(COMPLETIONS_OUT_DIR)/_$(TRANSFORMED_PACKAGE_NAME): $(CARGO_BIN) | $(COMPLETIONS_OUT_DIR)
5555
$(INSTALL) -m755 $$(cat $(_RUST_OUT))/$(COMPLETIONS_OUT_DIR)/_$(PACKAGE_NAME) $@
5656

57-
$(_RUST_OUT) $(CARGO_BIN): $(@PACKAGE_VAR@_SOURCES) $(EXTRA_@PACKAGE_VAR@_SOURCES)
57+
$(_RUST_OUT) $(CARGO_BIN): $(@PACKAGE_VAR@_SOURCES) $(nodist_@PACKAGE_VAR@_SOURCES) $(EXTRA_@PACKAGE_VAR@_SOURCES)
5858
set -e
5959
export AUTOTOOLS_DEPENDENCIES="$^"
6060
$(CARGO_ENV) $(CARGO) build $(CARGO_VERBOSE) $(CARGO_FEATURE_ARGS) $(CARGO_RELEASE_ARGS)

0 commit comments

Comments
 (0)