diff --git a/Makefile.am b/Makefile.am index 22cd470..ab99056 100644 --- a/Makefile.am +++ b/Makefile.am @@ -116,14 +116,14 @@ edit = sed -e 's|[@]PERL[@]|$(PERL)|g' \ pmdir_in_INC = \ PERL5LIB= $(PERL) -V | \ awk '/@INC/ {p=1; next} p==1 {print $$1}' | \ - grep -F -q "$(pmdir)" + grep -F -x -q "$(pmdir)" calc_use_lib_pmdir = \ pmdir="$(pmdir)"; \ - if $(pmdir_in_INC); then \ + if [ $(FINDBIN) = yes ]; then \ + use_lib_pmdir="use FindBin; use lib \"\$$FindBin::Bin/../$${pmdir\#$(prefix)/}\";"; \ + elif $(pmdir_in_INC); then \ use_lib_pmdir=""; \ - elif [ "$${pmdir\#../}" != "$$pmdir" ]; then \ - use_lib_pmdir="use FindBin; use lib \"\$$FindBin::Bin/$$pmdir\";"; \ else \ use_lib_pmdir="use lib \"$(pmdir)\";"; \ fi diff --git a/configure.ac b/configure.ac index bcd66eb..0869e17 100644 --- a/configure.ac +++ b/configure.ac @@ -70,6 +70,15 @@ AC_ARG_WITH( [Install Perl modules in DIR]), [PMDIR=${withval}], [PMDIR='${prefix}'/"$pmdir_relative_path"]) + +AC_ARG_ENABLE( + [relative], + AS_HELP_STRING( + [--enable-relative], + [Load Stow modules relative to the main script]), + [FINDBIN="$enable_relative"], + [FINDBIN=no]) + AC_CONFIG_COMMANDS_POST([[ eval pmdir="$PMDIR" cat <