Skip to content
This repository has been archived by the owner on Dec 16, 2022. It is now read-only.

Commit

Permalink
Fix 'make install' with custom build_bindir
Browse files Browse the repository at this point in the history
'make install' failed when setting build_bindir since docs/Makefile expected
the julia executable to be under $(JULIAHOME)/usr/bin/.
  • Loading branch information
nalimilan committed Dec 10, 2016
1 parent 99e1968 commit d49c95a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ julia-debug julia-release : julia-% : julia-ui-% julia-sysimg-% julia-symlink ju
debug release : % : julia-%

docs: julia-sysimg-$(JULIA_BUILD_MODE)
@$(MAKE) $(QUIET_MAKE) -C $(BUILDROOT)/doc
@$(MAKE) $(QUIET_MAKE) -C $(BUILDROOT)/doc JULIA_EXECUTABLE=$(JULIA_EXECUTABLE_$(JULIA_BUILD_MODE))

check-whitespace:
ifneq ($(NO_GIT), 1)
Expand Down
3 changes: 2 additions & 1 deletion doc/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ default: html
# You can set these variables from the command line.
SRCDIR := $(abspath $(dir $(lastword $(MAKEFILE_LIST))))
JULIAHOME := $(abspath $(SRCDIR)/..)
JULIA_EXECUTABLE := $(JULIAHOME)/usr/bin/julia
include $(JULIAHOME)/Make.inc
JULIA_EXECUTABLE := $(build_bindir)/julia

.PHONY: help clean cleanall html pdf linkcheck doctest check

Expand Down

0 comments on commit d49c95a

Please sign in to comment.