aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xhooks/gnu_info_index.bash3
-rw-r--r--paludis/default_environment.cc1
2 files changed, 3 insertions, 1 deletions
diff --git a/hooks/gnu_info_index.bash b/hooks/gnu_info_index.bash
index e391a55..64baaeb 100755
--- a/hooks/gnu_info_index.bash
+++ b/hooks/gnu_info_index.bash
@@ -17,7 +17,8 @@
# this program; if not, write to the Free Software Foundation, Inc., 59 Temple
# Place, Suite 330, Boston, MA 02111-1307 USA
-source /sbin/functions.sh
+export PATH="$(${PALUDIS_EBUILD_DIR}/utils/canonicalise ${PALUDIS_EBUILD_DIR}/utils/ ):${PATH}"
+source ${PALUDIS_EBUILD_DIR}/echo_functions.bash
echo
einfo "Checking whether the GNU info directory needs updating..."
diff --git a/paludis/default_environment.cc b/paludis/default_environment.cc
index 8dc8245..ee1b328 100644
--- a/paludis/default_environment.cc
+++ b/paludis/default_environment.cc
@@ -388,6 +388,7 @@ namespace
("HOOK", hook.name())
("HOOK_LOG_LEVEL", Log::get_instance()->log_level_string())
("HOOK_CONFIG_SUFFIX", DefaultConfig::config_suffix())
+ ("PALUDIS_EBUILD_DIR", getenv_with_default("PALUDIS_EBUILD_DIR", LIBEXECDIR "/paludis"))
("PALUDIS_COMMAND", paludis_command));
for (Hook::Iterator h(hook.begin()), h_end(hook.end()) ; h != h_end ; ++h)