Skip to content

Commit 73d43af

Browse files
nalimilanKristofferC
authored andcommitted
Install terminfo data under /usr/share/julia (#55881)
Just like all other libraries, we don't want internal Julia files to mess with system files. Introduced by #55411. (cherry picked from commit 0dbb6eb)
1 parent 4f26286 commit 73d43af

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -405,7 +405,7 @@ endif
405405
$(INSTALL_F) $(JULIAHOME)/contrib/julia.appdata.xml $(DESTDIR)$(datarootdir)/appdata/
406406
# Install terminal info database
407407
ifneq ($(WITH_TERMINFO),0)
408-
cp -R -L $(build_datarootdir)/terminfo $(DESTDIR)$(datarootdir)
408+
cp -R -L $(build_datarootdir)/julia/terminfo $(DESTDIR)$(datarootdir)/julia/
409409
endif
410410

411411
# Update RPATH entries and JL_SYSTEM_IMAGE_PATH if $(private_libdir_rel) != $(build_private_libdir_rel)

base/terminfo.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ function find_terminfo_file(term::String)
262262
append!(terminfo_dirs,
263263
replace(split(ENV["TERMINFO_DIRS"], ':'),
264264
"" => "/usr/share/terminfo"))
265-
push!(terminfo_dirs, normpath(Sys.BINDIR, DATAROOTDIR, "terminfo"))
265+
push!(terminfo_dirs, normpath(Sys.BINDIR, DATAROOTDIR, "julia", "terminfo"))
266266
Sys.isunix() &&
267267
push!(terminfo_dirs, "/etc/terminfo", "/lib/terminfo", "/usr/share/terminfo")
268268
for dir in terminfo_dirs

deps/terminfo.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ $(BUILDDIR)/TermInfoDB-v$(TERMINFO_VER)/build-checked: $(BUILDDIR)/TermInfoDB-v$
2222
echo 1 > $@
2323

2424
define TERMINFO_INSTALL
25-
mkdir -p $2/$$(build_datarootdir)
26-
cp -R $1/terminfo $2/$$(build_datarootdir)
25+
mkdir -p $2/$$(build_datarootdir)/julia
26+
cp -R $1/terminfo $2/$$(build_datarootdir)/julia/
2727
endef
2828
$(eval $(call staged-install, \
2929
terminfo,TermInfoDB-v$(TERMINFO_VER), \

0 commit comments

Comments
 (0)