aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2009-02-16 14:58:08 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2009-02-16 14:58:08 +0000
commit1968d50c2de2e0a1762523c981dfd09ecdf29082 (patch)
treec0c1ef7e5d2eb6d31c51ffe1837aeb234ad36694
parent85ca9d49984a8bd16d5215eed20a243a63861bda (diff)
downloadpaludis-1968d50c2de2e0a1762523c981dfd09ecdf29082.tar.gz
paludis-1968d50c2de2e0a1762523c981dfd09ecdf29082.tar.xz
autotools is dumb
-rw-r--r--Makefile.am1
-rw-r--r--configure.ac13
-rw-r--r--paludis/environments/paludis/output_managers/Makefile.am2
3 files changed, 15 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am
index e04be24..ff10528 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,6 +9,7 @@ SUBDIRS = misc test paludis python ruby src doc hooks vim bash-completion zsh-co
DISTCHECK_CONFIGURE_FLAGS = --enable-qa --enable-ruby --enable-ruby-doc --enable-vim \
--enable-python --enable-python-doc --enable-xml \
--with-ruby-install-dir='$${DESTDIR}$${prefix}/ruby_dir' \
+ --with-hacked-log-dir='$${DESTDIR}$${prefix}/log_dir' \
--with-repositories=default,accounts \
--with-environments=default,portage \
--with-clients=default,accerso,appareo,cave,inquisitio,instruo \
diff --git a/configure.ac b/configure.ac
index 1634898..ce70324 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1473,6 +1473,19 @@ for m in env news ; do
done
dnl }}}
+dnl {{{ path hacks for distcheck
+AC_ARG_WITH([hacked-log-dir],
+ AS_HELP_STRING([--with-hacked-log-dir=dir], [Hack the log dir (for distcheck only)]),
+ HACKED_LOG_DIR=`eval echo $withval`,
+ HACKED_LOG_DIR=)
+AC_MSG_CHECKING([for hacked log dir for distcheck])
+if test "x$HACKED_LOG_DIR" = "x" ; then
+ HACKED_LOG_DIR=/var/log/paludis
+fi
+AC_MSG_RESULT([$HACKED_LOG_DIR])
+AC_SUBST([HACKED_LOG_DIR])
+dnl }}}
+
dnl {{{ pkg-config
AC_SUBST([PALUDIS_PC_CFLAGS])
AC_SUBST([PALUDIS_PC_LIBS])
diff --git a/paludis/environments/paludis/output_managers/Makefile.am b/paludis/environments/paludis/output_managers/Makefile.am
index c6bf4ab..b2fdadb 100644
--- a/paludis/environments/paludis/output_managers/Makefile.am
+++ b/paludis/environments/paludis/output_managers/Makefile.am
@@ -20,7 +20,7 @@ dist_shareenvpaludis_DATA = \
logged_only.part.conf \
show_messages.part.conf
-logdir = /var/log/paludis
+logdir = @HACKED_LOG_DIR@
log_DATA = .keep