[pve-devel] [PATCH cluster] change installarchlib to vendorarch

Wolfgang Bumiller w.bumiller at proxmox.com
Tue Apr 4 09:57:33 CEST 2017


Please don't include changes to the generated '.in' files.
If anything, start with a separate commit deleting all of them.
(Apparently with the original change I only deleted the one in the same
directory.)

On Mon, Apr 03, 2017 at 03:38:00PM +0200, Dominik Csapak wrote:
> installarchlib is
> /usr/lib/<arch>/perl/5.24
> which is only a symlink provided by libperl5.24 and not suited
> to install files in it directly
> 
> vendorarch is
> /usr/lib/<arch>/perl5/5.24
> which is the correct location for installing arch libraries
> (we already use this in librados2-perl)
> 
> Signed-off-by: Dominik Csapak <d.csapak at proxmox.com>
> ---
>  data/PVE/Makefile.am | 2 +-
>  data/PVE/Makefile.in | 4 ++--
>  data/configure.ac    | 4 ++--
>  data/src/Makefile.in | 2 +-
>  4 files changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/data/PVE/Makefile.am b/data/PVE/Makefile.am
> index d2508fa..6a38431 100644
> --- a/data/PVE/Makefile.am
> +++ b/data/PVE/Makefile.am
> @@ -8,7 +8,7 @@ AM_CFLAGS = -shared -fPIC -Wl,-z,relro -Wall -Werror -Wno-strict-aliasing $(PERL
>  LDADD = $(QB_LIBS)
>  
>  perlbin_PROGRAMS = IPCC.so
> -perlbindir = $(PERL_INSTALLARCHLIB)/auto/PVE/IPCC
> +perlbindir = $(PERL_VENDORARCH)/auto/PVE/IPCC
>  
>  # this require package pve-doc-generator
>  export NOVIEW=1
> diff --git a/data/PVE/Makefile.in b/data/PVE/Makefile.in
> index 1a90376..8c79005 100644
> --- a/data/PVE/Makefile.in
> +++ b/data/PVE/Makefile.in
> @@ -243,7 +243,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
>  PATH_SEPARATOR = @PATH_SEPARATOR@
>  PERL = @PERL@
>  PERL_INC = @PERL_INC@
> -PERL_INSTALLARCHLIB = @PERL_INSTALLARCHLIB@
> +PERL_VENDORARCH = @PERL_VENDORARCH@
>  PERL_VENDORLIB = @PERL_VENDORLIB@
>  PKG_CONFIG = @PKG_CONFIG@
>  PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
> @@ -303,7 +303,7 @@ top_srcdir = @top_srcdir@
>  bin_SCRIPTS = pvecm
>  AM_CFLAGS = -shared -fPIC -Wl,-z,relro -Wall -Werror -Wno-strict-aliasing $(PERL_INC) -DXS_VERSION=VERSION
>  LDADD = $(QB_LIBS)
> -perlbindir = $(PERL_INSTALLARCHLIB)/auto/PVE/IPCC
> +perlbindir = $(PERL_VENDORARCH)/auto/PVE/IPCC
>  man1_MANS = pvecm.1
>  man5_MANS = datacenter.cfg.5
>  IPCC_so_SOURCES = IPCC.c ppport.h
> diff --git a/data/configure.ac b/data/configure.ac
> index b4cf2e2..b113f5d 100644
> --- a/data/configure.ac
> +++ b/data/configure.ac
> @@ -67,10 +67,10 @@ AC_SUBST(PERL)
>  
>  PERL_INC="$(perl -MExtUtils::Embed -e perl_inc)"
>  PERL_VENDORLIB="$(perl -MConfig -e 'print $Config{vendorlibexp}')"
> -PERL_INSTALLARCHLIB="$(perl -MConfig -e 'print $Config{installarchlib}')"
> +PERL_VENDORARCH="$(perl -MConfig -e 'print $Config{vendorarch}')"
>  AC_SUBST(PERL_INC)
>  AC_SUBST(PERL_VENDORLIB)
> -AC_SUBST(PERL_INSTALLARCHLIB)
> +AC_SUBST(PERL_VENDORARCH)
>  
>  # Checks for header files.
>  AC_HEADER_DIRENT
> diff --git a/data/src/Makefile.in b/data/src/Makefile.in
> index e30c572..42aee8a 100644
> --- a/data/src/Makefile.in
> +++ b/data/src/Makefile.in
> @@ -466,7 +466,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
>  PATH_SEPARATOR = @PATH_SEPARATOR@
>  PERL = @PERL@
>  PERL_INC = @PERL_INC@
> -PERL_INSTALLARCHLIB = @PERL_INSTALLARCHLIB@
> +PERL_VENDORARCH = @PERL_VENDORARCH@
>  PERL_VENDORLIB = @PERL_VENDORLIB@
>  PKG_CONFIG = @PKG_CONFIG@
>  PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
> -- 
> 2.11.0
> 
> 
> _______________________________________________
> pve-devel mailing list
> pve-devel at pve.proxmox.com
> http://pve.proxmox.com/cgi-bin/mailman/listinfo/pve-devel




More information about the pve-devel mailing list