Skip to content

Commit 27d49fb

Browse files
committed
Extend pkgconfig relocatization to cover exec_prefix too.
1 parent e8c44bc commit 27d49fb

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

src/Auditor.jl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -209,10 +209,10 @@ function audit(prefix::Prefix, src_name::AbstractString = "";
209209
rm(f; force=true)
210210
end
211211

212-
# Make sure that `prefix` in pkg-config files use a relative prefix
212+
# Make sure that `(exec_)prefix` in pkg-config files use a relative prefix
213213
pc_files = collect_files(prefix, endswith(".pc"))
214-
pc_re = r"^prefix=(/.*)$"
215-
for f in pc_files
214+
for f in pc_files, prefix in ["prefix", "exec_prefix"]
215+
pc_re = Regex("^$prefix=(/.*)\$")
216216
# We want to replace every instance of `prefix=...` with
217217
# `prefix=${pcfiledir}/../..`
218218
changed = false
@@ -226,7 +226,7 @@ function audit(prefix::Prefix, src_name::AbstractString = "";
226226
f_rel = relpath(f, prefix.path)
227227
ndirs = count('/', f_rel)
228228
prefix_rel = join([".." for _ in 1:ndirs], "/")
229-
l = "prefix=\${pcfiledir}/$prefix_rel"
229+
l = "$prefix=\${pcfiledir}/$prefix_rel"
230230
changed = true
231231
end
232232
println(buf, l)

test/build_tests/libfoo/libfoo.pc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
prefix=/workplace/destdir
2-
exec_prefix=${prefix}
2+
exec_prefix=/workplace/destdir
33
includedir=${prefix}/include
44
libdir=${exec_prefix}/lib
55

0 commit comments

Comments
 (0)