Skip to content

Commit 58cf81e

Browse files
nalimilanKristofferC
authored andcommitted
Fix make install from tarballs (#54143)
This reverts part of 67b8ac0 (#47596 (comment)). That change broke `make install` from tarballs due to building docs again, which fails as there's no git repo (and also requires Internet access to download UnicodeData.txt. Fixes #54037. (cherry picked from commit d6dda7c)
1 parent 525b3a2 commit 58cf81e

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

Makefile

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,10 @@ $(foreach link,base $(JULIAHOME)/test,$(eval $(call symlink_target,$(link),$$(bu
6161
julia_flisp.boot.inc.phony: julia-deps
6262
@$(MAKE) $(QUIET_MAKE) -C $(BUILDROOT)/src julia_flisp.boot.inc.phony
6363

64+
# Build the HTML docs (skipped if already exists, notably in tarballs)
65+
$(BUILDROOT)/doc/_build/html/en/index.html: $(shell find $(BUILDROOT)/base $(BUILDROOT)/doc \( -path $(BUILDROOT)/doc/_build -o -path $(BUILDROOT)/doc/deps -o -name *_constants.jl -o -name *_h.jl -o -name version_git.jl \) -prune -o -type f -print)
66+
@$(MAKE) docs
67+
6468
julia-symlink: julia-cli-$(JULIA_BUILD_MODE)
6569
ifeq ($(OS),WINNT)
6670
echo '@"%~dp0/'"$$(echo '$(call rel_path,$(BUILDROOT),$(JULIA_EXECUTABLE))')"'" %*' | tr / '\\' > $(BUILDROOT)/julia.bat
@@ -265,7 +269,7 @@ define stringreplace
265269
endef
266270

267271

268-
install: $(build_depsbindir)/stringreplace docs
272+
install: $(build_depsbindir)/stringreplace $(BUILDROOT)/doc/_build/html/en/index.html
269273
@$(MAKE) $(QUIET_MAKE) $(JULIA_BUILD_MODE)
270274
@for subdir in $(bindir) $(datarootdir)/julia/stdlib/$(VERSDIR) $(docdir) $(man1dir) $(includedir)/julia $(libdir) $(private_libdir) $(sysconfdir) $(private_libexecdir); do \
271275
mkdir -p $(DESTDIR)$$subdir; \
@@ -523,7 +527,7 @@ app:
523527
darwinframework:
524528
$(MAKE) -C $(JULIAHOME)/contrib/mac/framework
525529

526-
light-source-dist.tmp: docs
530+
light-source-dist.tmp: $(BUILDROOT)/doc/_build/html/en/index.html
527531
ifneq ($(BUILDROOT),$(JULIAHOME))
528532
$(error make light-source-dist does not work in out-of-tree builds)
529533
endif

0 commit comments

Comments
 (0)