blob: 386ea3f27f91bb220eb6d66d0b49813836849bd9 [file] [log] [blame]
Brad Bishop19323692019-04-05 15:28:33 -04001From 19c1987b455998d2959a5fdf3d1ed911d35e70f2 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Wed, 2 Jan 2019 17:55:35 +0100
4Subject: [PATCH] configure_path.sh: do not hardcode $prefix/lib as library
5 path
6
Andrew Geissler595f6302022-01-24 19:11:47 +00007Upstream-Status: Submitted [https://github.com/arsv/perl-cross/pull/123]
Brad Bishop19323692019-04-05 15:28:33 -04008Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
9
10---
11 cnf/configure_args.sh | 2 +-
12 cnf/configure_path.sh | 11 ++++++-----
13 2 files changed, 7 insertions(+), 6 deletions(-)
14
15diff --git a/cnf/configure_args.sh b/cnf/configure_args.sh
16index 29ca4f5..3297fb3 100644
17--- a/cnf/configure_args.sh
18+++ b/cnf/configure_args.sh
19@@ -155,7 +155,7 @@ while [ $i -le $# -o -n "$n" ]; do
20 help) mode="help" ;;
21 regen|regenerate) mode="regen" ;;
22 keeplog) defuser "$a" 1 ;;
23- prefix|html[13]dir|libsdir) defuser $a "$v" ;;
24+ prefix|html[13]dir|libsdir|libdir) defuser $a "$v" ;;
25 man[13]dir|otherlibsdir) defuser $a "$v" ;;
26 siteprefix|sitehtml[13]dir) defuser $a "$v" ;;
27 siteman[13]dir|vendorman[13]dir)defuser $a "$v" ;;
28diff --git a/cnf/configure_path.sh b/cnf/configure_path.sh
29index fe7eac7..bcba8b8 100644
30--- a/cnf/configure_path.sh
31+++ b/cnf/configure_path.sh
32@@ -30,6 +30,7 @@ definst() {
33 define "$1" "$installpath$v"
34 }
35
36+define libdir "$prefix/lib"
37 define sharedir "$prefix/share"
38 define html1dir "$sharedir/doc/$perlname/html"
39 define html3dir "$sharedir/doc/$perlname/html"
40@@ -38,16 +39,16 @@ define man1ext "1"
41 define man3dir "$sharedir/man/man3"
42 define man3ext "3"
43 define bin "$prefix/bin"
44-define lib "$prefix/lib"
45+define lib "$libdir"
46 define scriptdir "$prefix/bin"
47 define libsdirs ' '
48-defrel privlib "$prefix/lib/$package/$version"
49-defrel archlib "$prefix/lib/$package/$version/$archname"
50+defrel privlib "$libdir/$package/$version"
51+defrel archlib "$libdir/$package/$version/$archname"
52 define perlpath "$prefix/bin/$perlname"
53 define d_archlib 'define'
54
55 define sitebin "$prefix/bin"
56-defrel sitelib_stem "$prefix/lib/$package/site_perl"
57+defrel sitelib_stem "$libdir/$package/site_perl"
58 define sitelib "$sitelib_stem/$version"
59 define sitearch "$sitelib_stem/$version/$archname"
60 define siteprefix "$prefix"
61@@ -145,7 +146,7 @@ vendortest() {
62 }
63
64 vendorpath vendorbin "$vendorprefix/bin"
65-vendorpath vendorlib_stem "$vendorprefix/lib/$package/vendor_perl"
66+vendorpath vendorlib_stem "$libdir/$package/vendor_perl"
67 vendorpath vendorlib "$vendorlib_stem/$version"
68 vendorpath vendorarch "$vendorlib_stem/$version/$archname"
69 vendorpath vendorscript "$vendorprefix/bin"