Skip to content

Commit

Permalink
Use $(LIBDIR) to key off $(JL_LIBDIR)
Browse files Browse the repository at this point in the history
  • Loading branch information
staticfloat committed Dec 28, 2013
1 parent 442f0c1 commit 1e68796
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions Make.inc
Original file line number Diff line number Diff line change
Expand Up @@ -66,14 +66,15 @@ BUILD_LLDB = 0
BUILD = $(JULIAHOME)/usr

# Directories where said libraries get installed to
JL_PRIVATE_LIBDIR = lib/julia
JL_LIBDIR = lib
LIBDIR = lib
JL_LIBDIR = $(LIBDIR)
JL_PRIVATE_LIBDIR = $(JL_LIBDIR)/julia

# This used for debian packaging, to conform to library layout guidelines
ifeq ($(MULTIARCH_INSTALL), 1)
MULTIARCH = $(shell gcc -print-multiarch)
JL_PRIVATE_LIBDIR = lib/$(MULTIARCH)/julia
JL_LIBDIR = lib/$(MULTIARCH)/
JL_PRIVATE_LIBDIR = $(LIBDIR)/$(MULTIARCH)/julia
JL_LIBDIR = $(LIBDIR)/$(MULTIARCH)/
endif

# Cross-compile
Expand Down

0 comments on commit 1e68796

Please sign in to comment.