aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2008-10-28 14:19:40 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2008-10-28 14:19:40 +0000
commitce4df37e1592c889e7fe14b6e7a3e57b10749e89 (patch)
tree41476a9b8316b8c3de2aee260432e8ced6625f72
parentf2d976c54f21cee71d890a011317f521221ec2a9 (diff)
downloadpaludis-ce4df37e1592c889e7fe14b6e7a3e57b10749e89.tar.gz
paludis-ce4df37e1592c889e7fe14b6e7a3e57b10749e89.tar.xz
Fix distcheck
-rw-r--r--paludis/environments/portage/Makefile.am1
-rw-r--r--paludis/environments/portage/portage_environment.cc5
2 files changed, 5 insertions, 1 deletions
diff --git a/paludis/environments/portage/Makefile.am b/paludis/environments/portage/Makefile.am
index eb0a9dc..1907007 100644
--- a/paludis/environments/portage/Makefile.am
+++ b/paludis/environments/portage/Makefile.am
@@ -57,6 +57,7 @@ TESTS_ENVIRONMENT = env \
PALUDIS_NO_CHOWN="yes" \
PALUDIS_TESTS_KEEP_STDERR="yes" \
SYSCONFDIR="$(sysconfdir)" \
+ PALUDIS_PORTAGE_BASHRC="$(top_srcdir)/paludis/environments/portage/bashrc" \
LD_LIBRARY_PATH="`echo $$LD_LIBRARY_PATH: | sed -e 's,^:,,'`` \
$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/e/`:` \
$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/e/.libs/`" \
diff --git a/paludis/environments/portage/portage_environment.cc b/paludis/environments/portage/portage_environment.cc
index 179c922..15a3266 100644
--- a/paludis/environments/portage/portage_environment.cc
+++ b/paludis/environments/portage/portage_environment.cc
@@ -713,7 +713,10 @@ std::tr1::shared_ptr<const FSEntrySequence>
PortageEnvironment::bashrc_files() const
{
std::tr1::shared_ptr<FSEntrySequence> result(new FSEntrySequence);
- result->push_back(FSEntry(LIBEXECDIR) / "paludis" / "environments" / "portage" / "bashrc");
+ if (! getenv_with_default("PALUDIS_PORTAGE_BASHRC", "").empty())
+ result->push_back(FSEntry(getenv_with_default("PALUDIS_PORTAGE_BASHRC", "")).realpath());
+ else
+ result->push_back(FSEntry(LIBEXECDIR) / "paludis" / "environments" / "portage" / "bashrc");
result->push_back(_imp->conf_dir / "make.globals");
result->push_back(_imp->conf_dir / "make.conf");
return result;