Commit b26c2109 authored by Petr Písař's avatar Petr Písař Committed by Michael Tremer

Install Perl files to Perl vendor directory

On Fedora, the original code placed files into /usr/lib64/perl5/5.36/.
That location is not recognized by Fedora perl.

It also supresses installation and uninstallaion of packlist and perlocal
inventory files. They cannot be reliably uninstalled without
corrupting them.
Signed-off-by: default avatarPetr Písař <ppisar@redhat.com>
Signed-off-by: default avatarMichael Tremer <michael.tremer@ipfire.org>
parent a6445b74
...@@ -241,7 +241,8 @@ build-perl: src/libloc.la ...@@ -241,7 +241,8 @@ build-perl: src/libloc.la
@test -e $(builddir)/src/perl/t/Location.t || ln -s --relative $(srcdir)/src/perl/t/Location.t $(builddir)/src/perl/t/ @test -e $(builddir)/src/perl/t/Location.t || ln -s --relative $(srcdir)/src/perl/t/Location.t $(builddir)/src/perl/t/
@test -e $(builddir)/src/perl/typemap || ln -s --relative $(srcdir)/src/perl/typemap $(builddir)/src/perl/ @test -e $(builddir)/src/perl/typemap || ln -s --relative $(srcdir)/src/perl/typemap $(builddir)/src/perl/
cd $(builddir)/src/perl && $(PERL) Makefile.PL PREFIX="$(prefix)" \ cd $(builddir)/src/perl && $(PERL) Makefile.PL NO_PACKLIST=1 NO_PERLLOCAL=1 \
INSTALLDIRS=vendor \
INC="-I$(abs_srcdir)/src" LIBS="-L$(abs_builddir)/src/.libs -lloc" INC="-I$(abs_srcdir)/src" LIBS="-L$(abs_builddir)/src/.libs -lloc"
cd $(builddir)/src/perl && $(MAKE) cd $(builddir)/src/perl && $(MAKE)
touch build-perl touch build-perl
...@@ -253,20 +254,20 @@ check-perl: testdata.db build-perl ...@@ -253,20 +254,20 @@ check-perl: testdata.db build-perl
.PHONY: install-perl .PHONY: install-perl
install-perl: build-perl install-perl: build-perl
cd $(builddir)/src/perl && $(MAKE) install DESTIDR=$(DESTDIR) cd $(builddir)/src/perl && $(MAKE) install DESTDIR=$(DESTDIR)
.PHONY: clean-perl .PHONY: clean-perl
clean-perl: clean-perl:
cd $(builddir)/src/perl && $(MAKE) distclean cd $(builddir)/src/perl && $(MAKE) distclean
rm build-perl rm -f build-perl
.PHONY: uninstall-perl .PHONY: uninstall-perl
uninstall-perl: uninstall-perl:
rm -rvf \ rm -vf \
$(DESTDIR)/$(prefix)/lib/*/perl/*/Location.pm \ $(DESTDIR)/@PERL_MODPATH@/Location.pm \
$(DESTDIR)/$(prefix)/lib/*/perl/*/auto/Location \ $(DESTDIR)/@PERL_MODPATH@/auto/Location/Location.so \
$(DESTDIR)/$(prefix)/lib/*/perl/*/perllocal.pod \ $(DESTDIR)/@PERL_MANPATH@/Location.3pm
$(DESTDIR)/$(prefix)/man/man3/Location.3pm -rmdir $(DESTDIR)/@PERL_MODPATH@/auto/Location
bin_SCRIPTS = \ bin_SCRIPTS = \
src/scripts/location \ src/scripts/location \
......
...@@ -175,10 +175,18 @@ PKG_CHECK_MODULES([PYTHON], [python-${PYTHON_VERSION}]) ...@@ -175,10 +175,18 @@ PKG_CHECK_MODULES([PYTHON], [python-${PYTHON_VERSION}])
AC_PATH_PROG(PERL, perl, no) AC_PATH_PROG(PERL, perl, no)
AC_SUBST(PERL) AC_SUBST(PERL)
AX_PROG_PERL_MODULES(ExtUtils::MakeMaker,, AC_MSG_WARN(Need some Perl modules)) AX_PROG_PERL_MODULES(Config ExtUtils::MakeMaker,, AC_MSG_WARN(Need some Perl modules))
AC_ARG_ENABLE(perl, AS_HELP_STRING([--disable-perl], [do not build the perl modules]), [],[enable_perl=yes]) AC_ARG_ENABLE(perl, AS_HELP_STRING([--disable-perl], [do not build the perl modules]), [],[enable_perl=yes])
AM_CONDITIONAL(ENABLE_PERL, test "$enable_perl" = "yes") AM_CONDITIONAL(ENABLE_PERL, test "$enable_perl" = "yes")
AS_IF([test "$enable_perl" = "yes"],
[
PERL_MODPATH=$($PERL -MConfig -e 'print $Config{installvendorarch}')
PERL_MANPATH=$($PERL -MConfig -e 'print $Config{installvendorman3dir}')
AC_SUBST(PERL_MODPATH)
AC_SUBST(PERL_MANPATH)
],
)
dnl Checking for libresolv dnl Checking for libresolv
case "${host}" in case "${host}" in
...@@ -223,5 +231,8 @@ AC_MSG_RESULT([ ...@@ -223,5 +231,8 @@ AC_MSG_RESULT([
systemd support: ${have_systemd} systemd support: ${have_systemd}
Bindings: Bindings:
perl: ${enable_perl} Perl: ${enable_perl}
Perl module path: ${PERL_MODPATH}
Perl manual path: ${PERL_MANPATH}
}
]) ])
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment