diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2011-04-02 17:25:13 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2011-04-12 22:47:28 +0200 |
| commit | b0e8ef4943279e271fe99e75ec82df27966b379b (patch) | |
| tree | 9ff982f9ed313fd5f0ae11d4df5ff302fb813cdb /scripts | |
| parent | a1f3d5bf5a4dd52be3ba197b674b61b693c79a8f (diff) | |
| download | ptxdist-b0e8ef4943279e271fe99e75ec82df27966b379b.tar.gz ptxdist-b0e8ef4943279e271fe99e75ec82df27966b379b.tar.xz | |
ptxd_make_world_install_mangle_pc: fix for prefix=/
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/lib/ptxd_make_world_install_mangle_pc.awk | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/scripts/lib/ptxd_make_world_install_mangle_pc.awk b/scripts/lib/ptxd_make_world_install_mangle_pc.awk index 705088440..3cb1b0258 100644 --- a/scripts/lib/ptxd_make_world_install_mangle_pc.awk +++ b/scripts/lib/ptxd_make_world_install_mangle_pc.awk @@ -34,12 +34,6 @@ FNR == 1 { replace[prefix "include"] = replace["includedir"]; replace[prefix "lib"] = replace["libdir"]; - # - # then remove trailing "/" (if any) - # - prefix = gensub(/(.+)\/$/, "\\1", "", prefix); - q_prefix = gensub(/([+/])/, "\\\\\\1", "g", prefix); - rel_sysroot = replace["prefix"] gensub(/\/[^/]+/, "/..", "g", prefix); @@ -54,7 +48,7 @@ $1 ~ /^(prefix|exec_prefix)$/ { $1 ~ /^(includedir|libdir)$/ { # replace e.g. /usr/include - if (match($2, prefix "\\/(include|lib)")) { + if (match($2, "^" prefix "(include|lib)")) { this_var = substr($2, RSTART, RLENGTH); sub(this_var, replace[this_var]); } @@ -65,7 +59,7 @@ $1 ~ /^(includedir|libdir)$/ { $1 ~ /^(Libs(\.private)?|Cflags):$/ { - this_regex = "(-[LI])(" SYSROOT "|" pkg_pkg_dir")"; + this_regex = "(-[LI])(" SYSROOT "|" pkg_pkg_dir")/"; # # replace absolute path by relative ones |