Merge pull request JuliaLang#7316 from crayxt/master

Ease building with custom includedir.

Make.inc

@@ -368,8 +368,8 @@ LLVM_CONFIG ?= llvm-config$(EXE)
 LLVM_LLC ?= llc$(EXE)
 JCPPFLAGS+=-DSYSTEM_LLVM
 else
-LLVM_CONFIG=$(LLVMROOT)/bin/llvm-config$(EXE)
-LLVM_LLC=$(LLVMROOT)/bin/llc$(EXE)
+LLVM_CONFIG=$(build_bindir)/llvm-config$(EXE)
+LLVM_LLC=$(build_bindir)/llc$(EXE)
 endif
 
 ifeq ($(USE_SYSTEM_PCRE), 1)

base/Makefile

@@ -14,7 +14,11 @@ endif
 all: pcre_h.jl errno_h.jl build_h.jl.phony fenv_constants.jl file_constants.jl uv_constants.jl version_git.jl.phony
 
 pcre_h.jl:
+ifeq ($(USE_SYSTEM_PCRE), 1)
  @$(call PRINT_PERL, $(CPP) -dM $(shell $(PCRE_CONFIG) --prefix)/include/pcre.h | perl -nle '/^\s*#define\s+PCRE_(\w*)\s*\(?($(PCRE_CONST))\)?\s*$$/ and print "const $$1 = uint32($$2)"' | sort > $@)
+else
+ @$(call PRINT_PERL, $(CPP) -dM $(build_includedir)/pcre.h | perl -nle '/^\s*#define\s+PCRE_(\w*)\s*\(?($(PCRE_CONST))\)?\s*$$/ and print "const $$1 = uint32($$2)"' | sort > $@)
+endif
 
 errno_h.jl:
  @$(call PRINT_PERL, echo '#include "errno.h"' | $(CPP) -dM - | perl -nle 'print "const $$1 = int32($$2)" if /^#define\s+(E\w+)\s+(\d+)\s*$$/' | sort > $@)

deps/Makefile

@@ -399,7 +399,7 @@ $(LLVM_OBJ_TARGET): $(LLVM_OBJ_SOURCE) | $(llvm_python_workaround)
  # LLVM has weird install prefixes (see llvm-$(LLVM_VER)/build_$(LLVM_BUILDTYPE)/Makefile.config for the full list)
  # We map them here to the "normal" ones, which means just prefixing "PROJ_" to the variable name.
  export PATH=$(abspath llvm-$(LLVM_VER)/python2_path):$$PATH && \
- $(MAKE) -C llvm-$(LLVM_VER)/build_$(LLVM_BUILDTYPE) install $(MAKE_COMMON) PROJ_libdir=$(build_libdir) PROJ_bindir=$(build_bindir)
+ $(MAKE) -C llvm-$(LLVM_VER)/build_$(LLVM_BUILDTYPE) install $(MAKE_COMMON) PROJ_libdir=$(build_libdir) PROJ_bindir=$(build_bindir) PROJ_includedir=$(build_includedir)
  touch -c $@
 
 clean-llvm:
@@ -480,7 +480,7 @@ pcre-$(PCRE_VER)/configure: pcre-$(PCRE_VER).tar.bz2
  touch -c $@
 pcre-$(PCRE_VER)/config.status: pcre-$(PCRE_VER)/configure
  cd pcre-$(PCRE_VER) && \
- ./configure $(CONFIGURE_COMMON) --enable-utf --enable-unicode-properties --enable-jit
+ ./configure $(CONFIGURE_COMMON) --enable-utf --enable-unicode-properties --enable-jit --includedir=$(build_includedir)
  touch -c $@
 $(PCRE_SRC_TARGET): pcre-$(PCRE_VER)/config.status
  $(MAKE) -C pcre-$(PCRE_VER) $(LIBTOOL_CCLD)
@@ -1413,6 +1413,8 @@ gmp-$(GMP_VER)/configure: gmp-$(GMP_VER).tar.bz2
  touch -c $@
 gmp-$(GMP_VER)/config.status: gmp-$(GMP_VER)/configure
  cd gmp-$(GMP_VER) && \
+ sed -ibackup 's|includeexecdir = $$(exec_prefix)/include|includeexecdir = $$(includedir)|g' Makefile.in && \
+ sed -ibackup 's|includeexecdir = $$(exec_prefix)/include|includeexecdir = $$(includedir)|g' Makefile.am && \
  ./configure $(CONFIGURE_COMMON) F77= --enable-shared --disable-static
  touch -c $@
 $(GMP_SRC_TARGET): gmp-$(GMP_VER)/config.status

src/flisp/Makefile

@@ -21,7 +21,7 @@ LLTDIR = ../support
 LLT = $(LLTDIR)/libsupport.a $(LIBUV) $(LIBUTF8PROC)
 
 FLAGS = -I$(LLTDIR) $(CFLAGS) $(HFILEDIRS:%=-I%) \
- -I$(LIBUV_INC) -I$(JULIAHOME)/usr/include $(LIBDIRS:%=-L%) \
+ -I$(LIBUV_INC) -I$(build_includedir) $(LIBDIRS:%=-L%) \
  -DLIBRARY_EXPORTS
 ifneq ($(USEMSVC), 1)
 FLAGS += -Wall -Wno-strict-aliasing -DUSE_COMPUTED_GOTO -fvisibility=hidden