projects / people / pmueller / ipfire-2.x.git / blame
| Commit | Line | Data |
|---|---|---|
| f964e925 PM |
1 | From e80f2517a230b73b1de554e6fe19e81947c2b665 Mon Sep 17 00:00:00 2001 |
| 2 | From: =?UTF-8?q?Peter=20M=C3=BCller?= <peter.mueller@ipfire.org> | |
| 3 | Date: Tue, 31 Jan 2023 10:04:31 +0000 | |
| 4 | Subject: [PATCH] Revert "Install Perl files to Perl vendor directory" | |
| 5 | ||
| 6 | This reverts commit b26c2109eaf229d8c297266f12cd4757d7f14eb8. | |
| 7 | --- | |
| 8 | Makefile.am | 17 ++++++++--------- | |
| 9 | configure.ac | 12 +----------- | |
| 10 | 2 files changed, 9 insertions(+), 20 deletions(-) | |
| 11 | ||
| 12 | diff --git a/Makefile.am b/Makefile.am | |
| 13 | index 7f0d8d0..049832f 100644 | |
| 14 | --- a/Makefile.am | |
| 15 | +++ b/Makefile.am | |
| 16 | @@ -241,8 +241,7 @@ build-perl: src/libloc.la | |
| 17 | @test -e $(builddir)/src/perl/t/Location.t || ln -s --relative $(srcdir)/src/perl/t/Location.t $(builddir)/src/perl/t/ | |
| 18 | @test -e $(builddir)/src/perl/typemap || ln -s --relative $(srcdir)/src/perl/typemap $(builddir)/src/perl/ | |
| 19 | ||
| 20 | - cd $(builddir)/src/perl && $(PERL) Makefile.PL NO_PACKLIST=1 NO_PERLLOCAL=1 \ | |
| 21 | - INSTALLDIRS=vendor \ | |
| 22 | + cd $(builddir)/src/perl && $(PERL) Makefile.PL PREFIX="$(prefix)" \ | |
| 23 | INC="-I$(abs_srcdir)/src" LIBS="-L$(abs_builddir)/src/.libs -lloc" | |
| 24 | cd $(builddir)/src/perl && $(MAKE) | |
| 25 | touch build-perl | |
| 26 | @@ -254,20 +253,20 @@ check-perl: testdata.db build-perl | |
| 27 | ||
| 28 | .PHONY: install-perl | |
| 29 | install-perl: build-perl | |
| 30 | - cd $(builddir)/src/perl && $(MAKE) install DESTDIR=$(DESTDIR) | |
| 31 | + cd $(builddir)/src/perl && $(MAKE) install DESTIDR=$(DESTDIR) | |
| 32 | ||
| 33 | .PHONY: clean-perl | |
| 34 | clean-perl: | |
| 35 | cd $(builddir)/src/perl && $(MAKE) distclean | |
| 36 | - rm -f build-perl | |
| 37 | + rm build-perl | |
| 38 | ||
| 39 | .PHONY: uninstall-perl | |
| 40 | uninstall-perl: | |
| 41 | - rm -vf \ | |
| 42 | - $(DESTDIR)/@PERL_MODPATH@/Location.pm \ | |
| 43 | - $(DESTDIR)/@PERL_MODPATH@/auto/Location/Location.so \ | |
| 44 | - $(DESTDIR)/@PERL_MANPATH@/Location.3pm | |
| 45 | - -rmdir $(DESTDIR)/@PERL_MODPATH@/auto/Location | |
| 46 | + rm -rvf \ | |
| 47 | + $(DESTDIR)/$(prefix)/lib/*/perl/*/Location.pm \ | |
| 48 | + $(DESTDIR)/$(prefix)/lib/*/perl/*/auto/Location \ | |
| 49 | + $(DESTDIR)/$(prefix)/lib/*/perl/*/perllocal.pod \ | |
| 50 | + $(DESTDIR)/$(prefix)/man/man3/Location.3pm | |
| 51 | ||
| 52 | bin_SCRIPTS = \ | |
| 53 | src/scripts/location \ | |
| 54 | diff --git a/configure.ac b/configure.ac | |
| 55 | index 96e6b0e..f6d30f7 100644 | |
| 56 | --- a/configure.ac | |
| 57 | +++ b/configure.ac | |
| 58 | @@ -175,18 +175,10 @@ PKG_CHECK_MODULES([PYTHON], [python-${PYTHON_VERSION}]) | |
| 59 | AC_PATH_PROG(PERL, perl, no) | |
| 60 | AC_SUBST(PERL) | |
| 61 | ||
| 62 | -AX_PROG_PERL_MODULES(Config ExtUtils::MakeMaker,, AC_MSG_WARN(Need some Perl modules)) | |
| 63 | +AX_PROG_PERL_MODULES(ExtUtils::MakeMaker,, AC_MSG_WARN(Need some Perl modules)) | |
| 64 | ||
| 65 | AC_ARG_ENABLE(perl, AS_HELP_STRING([--disable-perl], [do not build the perl modules]), [],[enable_perl=yes]) | |
| 66 | AM_CONDITIONAL(ENABLE_PERL, test "$enable_perl" = "yes") | |
| 67 | -AS_IF([test "$enable_perl" = "yes"], | |
| 68 | - [ | |
| 69 | - PERL_MODPATH=$($PERL -MConfig -e 'print $Config{installvendorarch}') | |
| 70 | - PERL_MANPATH=$($PERL -MConfig -e 'print $Config{installvendorman3dir}') | |
| 71 | - AC_SUBST(PERL_MODPATH) | |
| 72 | - AC_SUBST(PERL_MANPATH) | |
| 73 | - ], | |
| 74 | -) | |
| 75 | ||
| 76 | dnl Checking for libresolv | |
| 77 | case "${host}" in | |
| 78 | @@ -232,6 +224,4 @@ AC_MSG_RESULT([ | |
| 79 | ||
| 80 | Bindings: | |
| 81 | Perl: ${enable_perl} | |
| 82 | - Perl module path: ${PERL_MODPATH} | |
| 83 | - Perl manual path: ${PERL_MANPATH} | |
| 84 | ]) | |
| 85 | -- | |
| 86 | 2.35.3 | |
| 87 |