Skip to content

Commit c8b9fe9

Browse files
committed
Merge pull request #16044 from laurentbartholdi/lb/access-libraries
Added LIBDIR and INCLUDEDIR consts
2 parents 04f3a78 + 3b5aa70 commit c8b9fe9

File tree

2 files changed

+3
-0
lines changed

2 files changed

+3
-0
lines changed

Make.inc

+1
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,7 @@ private_libdir_rel := $(shell $(JULIAHOME)/contrib/relative_path.sh $(bindir) $(
179179
datarootdir_rel := $(shell $(JULIAHOME)/contrib/relative_path.sh $(bindir) $(datarootdir))
180180
docdir_rel := $(shell $(JULIAHOME)/contrib/relative_path.sh $(bindir) $(docdir))
181181
sysconfdir_rel := $(shell $(JULIAHOME)/contrib/relative_path.sh $(bindir) $(sysconfdir))
182+
includedir_rel := $(shell $(JULIAHOME)/contrib/relative_path.sh $(bindir) $(includedir))
182183

183184
INSTALL_F := $(JULIAHOME)/contrib/install.sh 644
184185
INSTALL_M := $(JULIAHOME)/contrib/install.sh 755

base/Makefile

+2
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,8 @@ endif
6565
@echo "const SYSCONFDIR = \"$(sysconfdir_rel)\"" >> $@
6666
@echo "const DATAROOTDIR = \"$(datarootdir_rel)\"" >> $@
6767
@echo "const DOCDIR = \"$(docdir_rel)\"" >> $@
68+
@echo "const LIBDIR = \"$(libdir_rel)\"" >> $@
69+
@echo "const INCLUDEDIR = \"$(includedir_rel)\"" >> $@
6870

6971
@# This to ensure that we always rebuild this file, but only when it is modified do we touch build_h.jl,
7072
@# ensuring we rebuild the system image as infrequently as possible

0 commit comments

Comments
 (0)