diff --git a/rem2pdf/Makefile.top.in b/rem2pdf/Makefile.top.in index 05a54592..52e45cdb 100644 --- a/rem2pdf/Makefile.top.in +++ b/rem2pdf/Makefile.top.in @@ -33,10 +33,16 @@ install: $(MAKE) install DESTDIR=$(DESTDIR) "INSTALL_BASE=$(INSTALL_BASE)" && exit 0; \ elif test "$(prefix)" = "/usr" ; then \ $(MAKE) install DESTDIR=$(DESTDIR) INSTALLDIRS=vendor && exit 0; \ - else \ + elif test "$(prefix)" = "/usr/local" ; then \ $(MAKE) install DESTDIR=$(DESTDIR) && exit 0; \ + else \ + $(MAKE) install DESTDIR=$(DESTDIR) "INSTALL_BASE=$(prefix)" && exit 0; \ fi; \ exit 1; Makefile: Makefile.PL - $(PERL) Makefile.PL @PERLARTIFACTS@ INSTALL_BASE=$(INSTALL_BASE) || true + if test "$(prefix)" != "/usr" -a "$(prefix)" != "/usr/local" -a "$(INSTALL_BASE)" = "" ; then \ + $(PERL) Makefile.PL @PERLARTIFACTS@ INSTALL_BASE=$(prefix) || true;\ + else \ + $(PERL) Makefile.PL @PERLARTIFACTS@ INSTALL_BASE=$(INSTALL_BASE) || true;\ + fi diff --git a/rem2pdf/bin/rem2pdf.in b/rem2pdf/bin/rem2pdf.in index 9a962049..7545d12d 100644 --- a/rem2pdf/bin/rem2pdf.in +++ b/rem2pdf/bin/rem2pdf.in @@ -1,6 +1,7 @@ #!@PERL@ use strict; use warnings; +use lib '@prefix@/lib/perl5'; use Encode; use Cairo;