aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-04-02 20:02:28 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-04-02 20:02:28 +0000
commitfa84d868b4ddf6aa8ca536a83c587e2c2656473e (patch)
tree92ac29691f4193f7d6f69d2e4dc88f96f9b3710c
parent145dc6e8cc34c168ea6ad0862574e05138a3401f (diff)
downloadpaludis-fa84d868b4ddf6aa8ca536a83c587e2c2656473e.tar.gz
paludis-fa84d868b4ddf6aa8ca536a83c587e2c2656473e.tar.xz
Move cran around
-rw-r--r--Makefile.am2
-rw-r--r--configure.ac2
-rw-r--r--paludis/repositories/cran/Makefile.am5
-rw-r--r--paludis/repositories/cran/cran/Makefile.am (renamed from cran/Makefile.am)0
-rw-r--r--paludis/repositories/cran/cran/cran.bash (renamed from cran/cran.bash)0
5 files changed, 5 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am
index c911b4d..ed74a15 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,7 +4,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 automake-deps-dist-hack.tmp
-SUBDIRS = misc tr1 test paludis cran ruby src doc hooks eselect bash-completion zsh-completion
+SUBDIRS = misc tr1 test paludis ruby src doc hooks eselect bash-completion zsh-completion
DISTCHECK_CONFIGURE_FLAGS = --enable-qa --enable-ruby --enable-glsa \
--with-ruby-install-dir='$${DESTDIR}$${prefix}/ruby_dir' \
diff --git a/configure.ac b/configure.ac
index ac7873a..3e12451 100644
--- a/configure.ac
+++ b/configure.ac
@@ -885,7 +885,6 @@ AM_CONFIG_HEADER(config.h)
AC_OUTPUT(
Makefile
bash-completion/Makefile
- cran/Makefile
doc/Makefile
doc/doxygen.conf
doc/examples/Makefile
@@ -910,6 +909,7 @@ AC_OUTPUT(
paludis/qa/Makefile
paludis/repositories/Makefile
paludis/repositories/cran/Makefile
+ paludis/repositories/cran/cran/Makefile
paludis/repositories/fake/Makefile
paludis/repositories/gems/Makefile
paludis/repositories/gentoo/Makefile
diff --git a/paludis/repositories/cran/Makefile.am b/paludis/repositories/cran/Makefile.am
index cb6720a..26c2a01 100644
--- a/paludis/repositories/cran/Makefile.am
+++ b/paludis/repositories/cran/Makefile.am
@@ -1,3 +1,4 @@
+SUBDIRS = cran .
CLEANFILES = *~ gmon.out *.gcov *.gcno *.gcda
DISTCLEANFILES = cran_repository-sr.hh cran_repository-sr.cc
MAINTAINERCLEANFILES = Makefile.in
@@ -94,7 +95,7 @@ check_PROGRAMS = $(TESTS)
check_SCRIPTS = cran_repository_TEST_setup.sh cran_repository_TEST_cleanup.sh
TESTS_ENVIRONMENT = env \
- CRAN_BASH_DIR="$(top_srcdir)/cran/" \
+ CRAN_BASH_DIR="$(top_srcdir)/paludis/repositories/cran/cran/" \
PALUDIS_SKIP_CONFIG="yes" \
TEST_SCRIPT_DIR="$(srcdir)/" \
PALUDIS_REPOSITORY_SO_DIR="$(top_builddir)/paludis/repositories" \
@@ -113,5 +114,5 @@ cran_installed_repository-sr.cc : cran_installed_repository.sr $(top_srcdir)/mis
$(top_srcdir)/misc/make_sr.bash --source $(srcdir)/cran_installed_repository.sr > $@
built-sources : $(BUILT_SOURCES)
- for s in $(SUBDIRS) ; do $(MAKE) -C $$s built-sources || exit 1 ; done
+ for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
diff --git a/cran/Makefile.am b/paludis/repositories/cran/cran/Makefile.am
index e1ab839..e1ab839 100644
--- a/cran/Makefile.am
+++ b/paludis/repositories/cran/cran/Makefile.am
diff --git a/cran/cran.bash b/paludis/repositories/cran/cran/cran.bash
index db88e28..db88e28 100644
--- a/cran/cran.bash
+++ b/paludis/repositories/cran/cran/cran.bash