aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-02-02 14:32:23 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-02-02 14:32:23 +0000
commit423be8994c496f41b2f9e2db7a6249af59b3d779 (patch)
tree4b3e0741babb3a50efd99c806c358ee33754332f
parent47d354c479ceb41b307390ce0a15c806a7280e83 (diff)
downloadpaludis-423be8994c496f41b2f9e2db7a6249af59b3d779.tar.gz
paludis-423be8994c496f41b2f9e2db7a6249af59b3d779.tar.xz
Start to install ebuild things
-rw-r--r--Makefile.am2
-rw-r--r--configure.ac1
-rw-r--r--ebuild/Makefile.am28
-rw-r--r--paludis/Makefile.am.m46
-rw-r--r--paludis/portage_repository.cc4
5 files changed, 38 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am
index d13dbaf..9133e93 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,7 +3,7 @@ MAINTAINERCLEANFILES = Makefile.in configure config/* aclocal.m4 \
config.h config.h.in INSTALL COPYING
AUTOMAKE_OPTIONS = dist-bzip2 no-dist-gzip std-options
EXTRA_DIST = autogen.bash
-SUBDIRS = misc test paludis src doc
+SUBDIRS = misc test paludis ebuild src doc
doxygen :
$(MAKE) -C doc doxygen
diff --git a/configure.ac b/configure.ac
index cb59789..7e12807 100644
--- a/configure.ac
+++ b/configure.ac
@@ -278,6 +278,7 @@ AC_OUTPUT(
Makefile
doc/Makefile
doc/doxygen.conf
+ ebuild/Makefile
misc/Makefile
misc/svn-version-filter-data.bash
paludis/Makefile
diff --git a/ebuild/Makefile.am b/ebuild/Makefile.am
new file mode 100644
index 0000000..5414f34
--- /dev/null
+++ b/ebuild/Makefile.am
@@ -0,0 +1,28 @@
+MAINTAINERCLEANFILES = Makefile.in
+CLEANFILES = *~
+
+libexecprogdir = $(libexecdir)/paludis/
+
+libexecprog_SCRIPTS = \
+ build_functions.bash \
+ depend.bash \
+ ebuild.bash \
+ echo_functions.bash \
+ eclass_functions.bash \
+ install_functions.bash \
+ list_functions.bash \
+ pkg_config.bash \
+ pkg_nofetch.bash \
+ pkg_postinst.bash \
+ pkg_postrm.bash \
+ pkg_preinst.bash \
+ pkg_prerm.bash \
+ pkg_setup.bash \
+ portage_stubs.bash \
+ sandbox_stubs.bash \
+ src_compile.bash \
+ src_install.bash \
+ src_test.bash \
+ src_unpack.bash \
+ unpack_functions.bash \
+ usage_error.bash
diff --git a/paludis/Makefile.am.m4 b/paludis/Makefile.am.m4
index 5a1fd75..ee9e0b0 100644
--- a/paludis/Makefile.am.m4
+++ b/paludis/Makefile.am.m4
@@ -40,7 +40,11 @@ libpaludis_a_SOURCES = filelist
TESTS = testlist
-TESTS_ENVIRONMENT = env TEST_SCRIPT_DIR="$(srcdir)/" $(SHELL) $(top_srcdir)/test/run_test.sh
+TESTS_ENVIRONMENT = env \
+ PALUDIS_EBUILD_DIR="$(srcdir)/ebuild/" \
+ TEST_SCRIPT_DIR="$(srcdir)/" \
+ $(SHELL) $(top_srcdir)/test/run_test.sh
+
check_PROGRAMS = $(TESTS)
check_SCRIPTS = testscriptlist
noinst_LIBRARIES = libpaludis.a
diff --git a/paludis/portage_repository.cc b/paludis/portage_repository.cc
index 781771c..b2c4c1d 100644
--- a/paludis/portage_repository.cc
+++ b/paludis/portage_repository.cc
@@ -22,6 +22,7 @@
#include "dir_iterator.hh"
#include "filter_insert_iterator.hh"
#include "fs_entry.hh"
+#include "getenv.hh"
#include "hashed_containers.hh"
#include "indirect_iterator.hh"
#include "is_file_with_extension.hh"
@@ -514,7 +515,8 @@ PortageRepository::do_version_metadata(
"T='/dev/null' " +
"D='/dev/null' " +
"S='/dev/null' " +
- "ebuild/ebuild.bash metadata '" +
+ getenv_with_default("PALUDIS_EBUILD_DIR", LIBEXECDIR "/paludis") +
+ "/ebuild.bash metadata '" +
stringify(_implementation->location) + "/" + stringify(c) + "/" + stringify(p) + "/" +
stringify(p) + "-" + stringify(v) + ".ebuild'");