aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-06-29 01:59:03 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-06-29 01:59:03 +0000
commit812803b2abd25658b22638f1bb0b30a95f39c9b3 (patch)
tree4ffc38a332a78d735c1f00b53fd81e39fe6ecfaa
parent1473db350d17d4501d0409a5882888bb2bb0e560 (diff)
downloadpaludis-812803b2abd25658b22638f1bb0b30a95f39c9b3.tar.gz
paludis-812803b2abd25658b22638f1bb0b30a95f39c9b3.tar.xz
Nasty hack to make distcheck work when autotools starts sticking things in different directories
-rw-r--r--ebuild/builtin_merge.bash4
-rw-r--r--ebuild/builtin_unmerge.bash2
-rwxr-xr-xebuild/ebuild.bash3
-rw-r--r--src/Makefile.am1
4 files changed, 7 insertions, 3 deletions
diff --git a/ebuild/builtin_merge.bash b/ebuild/builtin_merge.bash
index 27732ae..8e4ef8a 100644
--- a/ebuild/builtin_merge.bash
+++ b/ebuild/builtin_merge.bash
@@ -74,13 +74,13 @@ builtin_merge()
if [[ -n "${D}" ]] && [[ -d "${D}" ]] ; then
install -d "${ROOT%/}/" || die "couldn't make \${ROOT} (\"${ROOT}\")"
if [[ -d "${D}" ]] ; then
- ${PALUDIS_EBUILD_MODULES_DIR}/utils/merge "${D%/}/" "${ROOT%/}/" "${dbdir}/CONTENTS" \
+ merge "${D%/}/" "${ROOT%/}/" "${dbdir}/CONTENTS" \
|| die "merge failed"
fi
fi
if [[ -n "${reinstall}" ]] ; then
- ${PALUDIS_EBUILD_MODULES_DIR}/utils/unmerge "${ROOT%/}/" "${dbdir}/OLDCONTENTS" \
+ unmerge "${ROOT%/}/" "${dbdir}/OLDCONTENTS" \
|| die "unmerge failed"
rm -f "${dbdir}/OLDCONTENTS"
fi
diff --git a/ebuild/builtin_unmerge.bash b/ebuild/builtin_unmerge.bash
index ca9e6b2..063969a 100644
--- a/ebuild/builtin_unmerge.bash
+++ b/ebuild/builtin_unmerge.bash
@@ -53,7 +53,7 @@ builtin_unmerge()
export CONFIG_PROTECT="${CONFIG_PROTECT}"
export CONFIG_PROTECT_MASK="${CONFIG_PROTECT_MASK}"
- ${PALUDIS_EBUILD_MODULES_DIR}/utils/unmerge "${ROOT}/" "${dbdir}/CONTENTS" \
+ unmerge "${ROOT}/" "${dbdir}/CONTENTS" \
|| die "unmerge failed"
rm -fr "${dbdir}"
diff --git a/ebuild/ebuild.bash b/ebuild/ebuild.bash
index b65af51..0accc54 100755
--- a/ebuild/ebuild.bash
+++ b/ebuild/ebuild.bash
@@ -55,6 +55,9 @@ diefunc()
exit 249
}
+if [[ -n "${PALUDIS_EBUILD_DIR_FALLBACK}" ]] ; then
+ export PATH="${PALUDIS_EBUILD_DIR_FALLBACK}/utils:${PATH}"
+fi
export PATH="${PALUDIS_EBUILD_DIR}/utils:${PATH}"
EBUILD_MODULES_DIR=$(canonicalise $(dirname $0 ) )
[[ -d ${EBUILD_MODULES_DIR} ]] || die "${EBUILD_MODULES_DIR} is not a directory"
diff --git a/src/Makefile.am b/src/Makefile.am
index 16b2c78..2c9e466 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -30,6 +30,7 @@ TESTS_ENVIRONMENT = env \
TEST_SCRIPT_DIR="$(srcdir)/" \
PALUDIS_NO_GLOBAL_HOOKS="yes" \
PALUDIS_EBUILD_DIR="`$(top_srcdir)/ebuild/utils/canonicalise $(top_srcdir)/ebuild/`" \
+ PALUDIS_EBUILD_DIR_FALLBACK="`$(top_srcdir)/ebuild/utils/canonicalise $(top_builddir)/ebuild/`" \
SYSCONFDIR="$(sysconfdir)" \
bash $(top_srcdir)/test/run_test.sh bash